Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup MuTEMaster code #2282

Merged
merged 23 commits into from
Sep 25, 2023
Merged

Cleanup MuTEMaster code #2282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
7d27600
exit early
boubou19 Sep 8, 2023
4a7eca7
spotless
boubou19 Sep 8, 2023
8614cd4
better side checking
boubou19 Sep 8, 2023
38fad2e
make if blocks mutually exclusive
boubou19 Sep 8, 2023
a3549fe
more exit early
boubou19 Sep 8, 2023
dfb7075
convert nested ternary operators into if blocks
boubou19 Sep 8, 2023
bf0ca81
remove dead code
boubou19 Sep 8, 2023
050249e
collapse nested if blocks
boubou19 Sep 8, 2023
f503a4c
add todo to break verylong condition into much smaller ones
boubou19 Sep 8, 2023
dd904eb
spotless apply
boubou19 Sep 8, 2023
a1b77f9
merge feature/MuTEMaster into fix/cleanup
boubou19 Sep 9, 2023
aa1c4cb
collapsing nested if blocks and more exit early
boubou19 Sep 9, 2023
d91876f
spotless apply
boubou19 Sep 9, 2023
d8116ce
extract try/catch block to its own utility method
boubou19 Sep 9, 2023
37b9449
break down this unreadable condition
boubou19 Sep 11, 2023
46c7084
boolean magic (1/5)
boubou19 Sep 11, 2023
28538f6
boolean magic (2/5)
boubou19 Sep 11, 2023
67fdeec
boolean magic (3/5)
boubou19 Sep 11, 2023
d5dd325
boolean magic (4/5)
boubou19 Sep 11, 2023
991bbb3
boolean magic (5/5)
boubou19 Sep 11, 2023
22a4d95
remove todo
boubou19 Sep 11, 2023
cb5a8b3
Fix logic
mitchej123 Sep 11, 2023
f24b9e6
Merge branch 'feature/MuTEMaster' into fix/cleanup
BlueWeabo Sep 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion src/main/java/gregtech/api/metatileentity/BaseTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,8 @@
import com.gtnewhorizons.modularui.common.widget.SlotWidget;
import com.gtnewhorizons.modularui.common.widget.TextWidget;

import cpw.mods.fml.common.FMLCommonHandler;
import cpw.mods.fml.relauncher.Side;
import gregtech.GT_Mod;
import gregtech.api.enums.Dyes;
import gregtech.api.enums.GT_Values;
Expand Down Expand Up @@ -173,13 +175,18 @@ public final int getOffsetZ(ForgeDirection side, int aMultiplier) {
@Override
public final boolean isServerSide() {
if (worldObj == null) {
return false;
return FMLCommonHandler.instance()
.getEffectiveSide() == Side.SERVER;
}
return !worldObj.isRemote;
}

@Override
public final boolean isClientSide() {
if (worldObj == null) {
return FMLCommonHandler.instance()
.getEffectiveSide() == Side.CLIENT;
}
return worldObj.isRemote;
}

Expand Down
39 changes: 20 additions & 19 deletions src/main/java/gregtech/api/multitileentity/MultiTileEntityBlock.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,13 +368,17 @@ public final void harvestBlock(World aWorld, EntityPlayer aPlayer, int aX, int a
final int aFortune = EnchantmentHelper.getFortuneModifier(aPlayer);
float aChance = 1.0F;
final TileEntity aTileEntity = getTileEntity(aWorld, aX, aY, aZ, true);
if (aTileEntity instanceof IMultiTileEntity) {
final ArrayList<ItemStack> tList = ((IMultiTileEntity) aTileEntity).getDrops(aFortune, aSilkTouch);
aChance = ForgeEventFactory
.fireBlockHarvesting(tList, aWorld, this, aX, aY, aZ, aMeta, aFortune, aChance, aSilkTouch, aPlayer);
for (final ItemStack tStack : tList)
if (XSTR.XSTR_INSTANCE.nextFloat() <= aChance) dropBlockAsItem(aWorld, aX, aY, aZ, tStack);

if (!(aTileEntity instanceof IMultiTileEntity)) {
return;
}

final ArrayList<ItemStack> tList = ((IMultiTileEntity) aTileEntity).getDrops(aFortune, aSilkTouch);
aChance = ForgeEventFactory
.fireBlockHarvesting(tList, aWorld, this, aX, aY, aZ, aMeta, aFortune, aChance, aSilkTouch, aPlayer);
for (final ItemStack tStack : tList)
if (XSTR.XSTR_INSTANCE.nextFloat() <= aChance) dropBlockAsItem(aWorld, aX, aY, aZ, tStack);

}

@Override
Expand Down Expand Up @@ -473,12 +477,17 @@ public boolean hasComparatorInputOverride() {
@Override
public final int getComparatorInputOverride(World aWorld, int aX, int aY, int aZ, int ordinalSide) {
final TileEntity aTileEntity = aWorld.getTileEntity(aX, aY, aZ);
return aTileEntity instanceof IMTE_GetComparatorInputOverride override
? override.getComparatorInputOverride(ForgeDirection.getOrientation(ordinalSide))
: aTileEntity instanceof IMTE_IsProvidingWeakPower power ? power.isProvidingWeakPower(
if (aTileEntity instanceof IMTE_GetComparatorInputOverride override) {
return override.getComparatorInputOverride(ForgeDirection.getOrientation(ordinalSide));
}

if (aTileEntity instanceof IMTE_IsProvidingWeakPower power) {
return power.isProvidingWeakPower(
ForgeDirection.getOrientation(ordinalSide)
.getOpposite())
: super.getComparatorInputOverride(aWorld, aX, aY, aZ, ordinalSide);
.getOpposite());
}

return super.getComparatorInputOverride(aWorld, aX, aY, aZ, ordinalSide);
}

@Override
Expand Down Expand Up @@ -629,14 +638,6 @@ public void receiveCoverData(IMultiTileEntity mte, int aCover0, int aCover1, int
mte.issueBlockUpdate();
}
}
//
// te.receiveClientData(GregTechTileClientEvents.CHANGE_COMMON_DATA, aTextureData);
//
// te.receiveClientData(GregTechTileClientEvents.CHANGE_CUSTOM_DATA, aUpdateData & 0x7F);
// te.receiveClientData(GregTechTileClientEvents.CHANGE_CUSTOM_DATA, aTexturePage | 0x80);
//
// te.receiveClientData(GregTechTileClientEvents.CHANGE_COLOR, aColorData);
// te.receiveClientData(GregTechTileClientEvents.CHANGE_REDSTONE_OUTPUT, aRedstoneData);

@Override
public final TileEntity createTileEntity(World aWorld, int aMeta) {
Expand Down
151 changes: 82 additions & 69 deletions src/main/java/gregtech/api/multitileentity/MultiTileEntityItemInternal.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,22 +73,25 @@ public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List<String>
@SuppressWarnings("unchecked")
public void getSubItems(Item aItem, CreativeTabs aTab, List<ItemStack> aList) {
for (MultiTileEntityClassContainer tClass : mBlock.mMultiTileEntityRegistry.mRegistrations) {
if (!tClass.mHidden) {
if (((IMultiTileEntity) tClass.mCanonicalTileEntity)
.getSubItems(mBlock, aItem, aTab, aList, tClass.mID)) {
aList.add(mBlock.mMultiTileEntityRegistry.getItem(tClass.mID));
}
if (!tClass.mHidden && ((IMultiTileEntity) tClass.mCanonicalTileEntity)
.getSubItems(mBlock, aItem, aTab, aList, tClass.mID)) {
aList.add(mBlock.mMultiTileEntityRegistry.getItem(tClass.mID));
}
}
}

@Override
public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, int aX, int aY, int aZ,
int ordinalSide, float aHitX, float aHitY, float aHitZ) {

if (aY < 0 || aY > aWorld.getHeight()) return false;

if (aPlayer == null) return false;

try {
ForgeDirection side = ForgeDirection.getOrientation(ordinalSide);
final Block tClickedBlock = aWorld.getBlock(aX, aY, aZ);

if (tClickedBlock instanceof BlockSnow && (aWorld.getBlockMetadata(aX, aY, aZ) & 7) < 1) {
ordinalSide = SIDE_TOP;
side = ForgeDirection.UP;
Expand All @@ -102,79 +105,89 @@ public boolean onItemUse(ItemStack aStack, EntityPlayer aPlayer, World aWorld, i
final Block tReplacedBlock = aWorld.getBlock(aX, aY, aZ);

if (!tReplacedBlock.isReplaceable(aWorld, aX, aY, aZ)
|| !mBlock.canReplace(aWorld, aX, aY, aZ, ordinalSide, aStack)) return false;
if (aStack.stackSize == 0 || (aPlayer != null && !aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack)))
|| !mBlock.canReplace(aWorld, aX, aY, aZ, ordinalSide, aStack)) {
return false;
}

if (aStack.stackSize == 0 || (!aPlayer.canPlayerEdit(aX, aY, aZ, ordinalSide, aStack))) {
return false;
}

final MultiTileEntityContainer aMTEContainer = mBlock.mMultiTileEntityRegistry
.getNewTileEntityContainer(aWorld, aX, aY, aZ, aStack);

if (aMTEContainer != null
&& (aPlayer == null || aPlayer.isSneaking()
|| !(aMTEContainer.mTileEntity instanceof IMTE_OnlyPlaceableWhenSneaking mteSNeaking)
|| !mteSNeaking.onlyPlaceableWhenSneaking())
&& (aWorld.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1))
|| (aMTEContainer.mTileEntity instanceof IMTE_IgnoreEntityCollisionWhenPlacing mteIgnoreCollision
&& mteIgnoreCollision.ignoreEntityCollisionWhenPlacing(
aStack,
aPlayer,
aWorld,
aX,
aY,
aZ,
side,
aHitX,
aHitY,
aHitZ)))
&& (!(aMTEContainer.mTileEntity instanceof IMTE_CanPlace mteCanPlace)
|| mteCanPlace.canPlace(aStack, aPlayer, aWorld, aX, aY, aZ, side, aHitX, aHitY, aHitZ))
&& aWorld.setBlock(aX, aY, aZ, aMTEContainer.mBlock, 15 - aMTEContainer.mBlockMetaData, 2)) {
aMTEContainer.setMultiTile(aWorld, aX, aY, aZ);

try {
if (((IMultiTileEntity) aMTEContainer.mTileEntity)
.onPlaced(aStack, aPlayer, aWorld, aX, aY, aZ, side, aHitX, aHitY, aHitZ)) {
aWorld.playSoundEffect(
aX + 0.5,
aY + 0.5,
aZ + 0.5,
aMTEContainer.mBlock.stepSound.func_150496_b(),
(aMTEContainer.mBlock.stepSound.getVolume() + 1) / 2,
aMTEContainer.mBlock.stepSound.getPitch() * 0.8F);
}
} catch (Throwable e) {
GT_FML_LOGGER.error("onPlaced", e);
}
try {
if (aMTEContainer.mTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData mteData
&& (mteData.hasMultiBlockMachineRelevantData())) {
GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
}
} catch (Throwable e) {
GT_FML_LOGGER.error("causeMachineUpdate", e);
}
try {
if (!aWorld.isRemote) {
aWorld.notifyBlockChange(aX, aY, aZ, tReplacedBlock);
aWorld.func_147453_f /* updateNeighborsAboutBlockChange */(aX, aY, aZ, aMTEContainer.mBlock);
}
} catch (Throwable e) {
GT_FML_LOGGER.error("notifyBlockChange", e);
if (aMTEContainer == null) return false;

if (!aPlayer.isSneaking() && aMTEContainer.mTileEntity instanceof IMTE_OnlyPlaceableWhenSneaking mteSNeaking
&& mteSNeaking.onlyPlaceableWhenSneaking()) {
return false;
}

if (!aWorld.checkNoEntityCollision(AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 1, aZ + 1))) {
return false;
}

if (!(aMTEContainer.mTileEntity instanceof IMTE_IgnoreEntityCollisionWhenPlacing mteIgnoreCollision)
|| !mteIgnoreCollision
.ignoreEntityCollisionWhenPlacing(aStack, aPlayer, aWorld, aX, aY, aZ, side, aHitX, aHitY, aHitZ)) {
return false;
}

if (aMTEContainer.mTileEntity instanceof IMTE_CanPlace mteCanPlace
&& !mteCanPlace.canPlace(aStack, aPlayer, aWorld, aX, aY, aZ, side, aHitX, aHitY, aHitZ)) {
return false;
}

if (!aWorld.setBlock(aX, aY, aZ, aMTEContainer.mBlock, 15 - aMTEContainer.mBlockMetaData, 2)) {
return false;
}

aMTEContainer.setMultiTile(aWorld, aX, aY, aZ);

try {
if (((IMultiTileEntity) aMTEContainer.mTileEntity)
.onPlaced(aStack, aPlayer, aWorld, aX, aY, aZ, side, aHitX, aHitY, aHitZ)) {
aWorld.playSoundEffect(
aX + 0.5,
aY + 0.5,
aZ + 0.5,
aMTEContainer.mBlock.stepSound.func_150496_b(),
(aMTEContainer.mBlock.stepSound.getVolume() + 1) / 2,
aMTEContainer.mBlock.stepSound.getPitch() * 0.8F);
}
try {
((IMultiTileEntity) aMTEContainer.mTileEntity).onTileEntityPlaced();
} catch (Throwable e) {
GT_FML_LOGGER.error("onTileEntityPlaced", e);
} catch (Throwable e) {
GT_FML_LOGGER.error("onPlaced", e);
}
try {
if (aMTEContainer.mTileEntity instanceof IMTE_HasMultiBlockMachineRelevantData mteData
&& (mteData.hasMultiBlockMachineRelevantData())) {
GregTech_API.causeMachineUpdate(aWorld, aX, aY, aZ);
}
try {
aWorld.func_147451_t /* updateAllLightTypes */(aX, aY, aZ);
} catch (Throwable e) {
GT_FML_LOGGER.error("updateAllLightTypes", e);
} catch (Throwable e) {
GT_FML_LOGGER.error("causeMachineUpdate", e);
}
try {
if (!aWorld.isRemote) {
aWorld.notifyBlockChange(aX, aY, aZ, tReplacedBlock);
aWorld.func_147453_f /* updateNeighborsAboutBlockChange */(aX, aY, aZ, aMTEContainer.mBlock);
}

aStack.stackSize--;
return true;
} catch (Throwable e) {
GT_FML_LOGGER.error("notifyBlockChange", e);
}
try {
((IMultiTileEntity) aMTEContainer.mTileEntity).onTileEntityPlaced();
} catch (Throwable e) {
GT_FML_LOGGER.error("onTileEntityPlaced", e);
}
try {
aWorld.func_147451_t /* updateAllLightTypes */(aX, aY, aZ);
} catch (Throwable e) {
GT_FML_LOGGER.error("updateAllLightTypes", e);
}

aStack.stackSize--;
return true;

} catch (Throwable e) {
GT_FML_LOGGER.error("onItemUse", e);
}
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/gregtech/api/multitileentity/base/MultiTileEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -749,8 +749,7 @@ public boolean onRightClick(EntityPlayer aPlayer, ForgeDirection side, float aX,
}

if (!getCoverInfoAtSide(side).isGUIClickable()) return false;
}
if (isServerSide()) {
} else { // server side
if (!privateAccess() || aPlayer.getDisplayName()
.equalsIgnoreCase(getOwnerName())) {
final ItemStack tCurrentItem = aPlayer.inventory.getCurrentItem();
Expand Down
Loading