diff options
Diffstat (limited to 'src/main')
37 files changed, 86 insertions, 83 deletions
diff --git a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java index 0a1b2e8b02..7a2f1bedac 100644 --- a/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java +++ b/src/main/java/gregtech/api/metatileentity/implementations/GT_MetaTileEntity_MultiBlockBase.java @@ -858,10 +858,14 @@ public abstract class GT_MetaTileEntity_MultiBlockBase extends MetaTileEntity { if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch) { ((GT_MetaTileEntity_Hatch) aMetaTileEntity).updateTexture(aBaseCasingIndex); } - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Input) { + ((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity).mRecipeMap = getRecipeMap(); return mInputHatches.add((GT_MetaTileEntity_Hatch_Input) aMetaTileEntity); - if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) + } + if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_InputBus) { + ((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity).mRecipeMap = getRecipeMap(); return mInputBusses.add((GT_MetaTileEntity_Hatch_InputBus) aMetaTileEntity); + } if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_Output) return mOutputHatches.add((GT_MetaTileEntity_Hatch_Output) aMetaTileEntity); if (aMetaTileEntity instanceof GT_MetaTileEntity_Hatch_OutputBus) diff --git a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java index 2fa860bb20..64651a3fc4 100644 --- a/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java +++ b/src/main/java/gregtech/common/tileentities/machines/long_distance/GT_MetaTileEntity_LongDistancePipelineBase.java @@ -105,6 +105,7 @@ public abstract class GT_MetaTileEntity_LongDistancePipelineBase extends GT_Meta final IGregTechTileEntity gt_tile = getBaseMetaTileEntity(); if (gt_tile == null || !gt_tile.isAllowedToWork() || gt_tile.isClientSide()) return false; World world = gt_tile.getWorld(); + if (world == null) return false; if (mTargetPos == null) { // We don't have a target position, scan the pipes diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java index e486596fe6..80bfb20009 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_Cleanroom.java @@ -21,11 +21,7 @@ import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.input.Keyboard; import static gregtech.api.enums.GT_Values.debugCleanroom; -import static gregtech.api.enums.Textures.BlockIcons.BLOCK_PLASCRETE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_ACTIVE_GLOW; -import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_TOP_CLEANROOM_GLOW; +import static gregtech.api.enums.Textures.BlockIcons.*; public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBase { private int mHeight = -1; @@ -48,10 +44,12 @@ public class GT_MetaTileEntity_Cleanroom extends GT_MetaTileEntity_MultiBlockBas final GT_Multiblock_Tooltip_Builder tt = new GT_Multiblock_Tooltip_Builder(); tt.addMachineType("Cleanroom") .addInfo("Controller block for the Cleanroom") - .addInfo("Consumes 40 EU/t when first turned on and 4 EU/t once at 100% efficiency when not overclocked")//? + .addInfo("Consumes 40 EU/t when first turned on") + .addInfo("and 4 EU/t once at 100% efficiency when not overclocked")//? .addInfo("An energy hatch accepts up to 2A, so you can use 2A LV or 1A MV") .addInfo("2 LV batteries + 1 LV generator or 1 MV generator")//? - .addInfo("Time required to reach full efficiency is propotional to the height of empty space within") + .addInfo("Time required to reach full efficiency is proportional to") + .addInfo("the height of empty space within") .addInfo("Make sure your Energy Hatch matches! ?") .addSeparator() .beginVariableStructureBlock(3, 15, 4, 15, 3, 15, true) diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java index ca6495ea65..3536030fe0 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_FusionComputer.java @@ -353,49 +353,44 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity if (this.mEUStore <= 0 && mMaxProgresstime > 0) { stopMachine(); } - if (getRepairStatus() > 0) { - if (mMaxProgresstime > 0 && doRandomMaintenanceDamage()) { - this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true); - if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) { - if (mOutputItems != null) - for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); - if (mOutputFluids != null) - for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); - mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]) - ((getIdealStatus() - getRepairStatus()) * 1000))); - mOutputItems = null; - mProgresstime = 0; - mMaxProgresstime = 0; - mEfficiencyIncrease = 0; - if (mOutputFluids != null && mOutputFluids.length > 0) { - try { - GT_Mod.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]); - } catch (Exception ignored) { - } + if (mMaxProgresstime > 0) { + this.getBaseMetaTileEntity().decreaseStoredEnergyUnits(mEUt, true); + if (mMaxProgresstime > 0 && ++mProgresstime >= mMaxProgresstime) { + if (mOutputItems != null) + for (ItemStack tStack : mOutputItems) if (tStack != null) addOutput(tStack); + if (mOutputFluids != null) + for (FluidStack tStack : mOutputFluids) if (tStack != null) addOutput(tStack); + mEfficiency = Math.max(0, Math.min(mEfficiency + mEfficiencyIncrease, getMaxEfficiency(mInventory[1]))); + mOutputItems = null; + mProgresstime = 0; + mMaxProgresstime = 0; + mEfficiencyIncrease = 0; + if (mOutputFluids != null && mOutputFluids.length > 0) { + try { + GT_Mod.achievements.issueAchivementHatchFluid(aBaseMetaTileEntity.getWorld().getPlayerEntityByName(aBaseMetaTileEntity.getOwnerName()), mOutputFluids[0]); + } catch (Exception ignored) { } - this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU(); - if (aBaseMetaTileEntity.isAllowedToWork()) - checkRecipe(mInventory[1]); } - } else { - if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { - turnCasingActive(mMaxProgresstime > 0); - if (aBaseMetaTileEntity.isAllowedToWork()) { - this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU(); - if (checkRecipe(mInventory[1])) { - if (this.mEUStore < this.mLastRecipe.mSpecialValue - this.mEUt) { - mMaxProgresstime = 0; - turnCasingActive(false); - } - aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue - this.mEUt, true); + this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU(); + if (aBaseMetaTileEntity.isAllowedToWork()) + checkRecipe(mInventory[1]); + } + } else { + if (aTick % 100 == 0 || aBaseMetaTileEntity.hasWorkJustBeenEnabled() || aBaseMetaTileEntity.hasInventoryBeenModified()) { + turnCasingActive(mMaxProgresstime > 0); + if (aBaseMetaTileEntity.isAllowedToWork()) { + this.mEUStore = (int) aBaseMetaTileEntity.getStoredEU(); + if (checkRecipe(mInventory[1])) { + if (this.mEUStore < this.mLastRecipe.mSpecialValue - this.mEUt) { + mMaxProgresstime = 0; + turnCasingActive(false); } + aBaseMetaTileEntity.decreaseStoredEnergyUnits(this.mLastRecipe.mSpecialValue - this.mEUt, true); } - if (mMaxProgresstime <= 0) - mEfficiency = Math.max(0, mEfficiency - 1000); } + if (mMaxProgresstime <= 0) + mEfficiency = Math.max(0, mEfficiency - 1000); } - } else { - this.mLastRecipe = null; - stopMachine(); } } else { turnCasingActive(false); @@ -403,8 +398,7 @@ public abstract class GT_MetaTileEntity_FusionComputer extends GT_MetaTileEntity stopMachine(); } } - aBaseMetaTileEntity.setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mWrench ? 0 : 1) | (mScrewdriver ? 0 : 2) | (mSoftHammer ? 0 : 4) | (mHardHammer ? 0 : 8) - | (mSolderingTool ? 0 : 16) | (mCrowbar ? 0 : 32) | (mMachine ? 0 : 64)); + aBaseMetaTileEntity.setErrorDisplayID((aBaseMetaTileEntity.getErrorDisplayID() & ~127) | (mMachine ? 0 : 64)); aBaseMetaTileEntity.setActive(mMaxProgresstime > 0); } } diff --git a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 26cccb7819..ad0f5bd7f8 100644 --- a/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/src/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -12,6 +12,7 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_CubicMultiBlockBase; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy; +import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Input; import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_InputBus; import gregtech.api.render.TextureFactory; import gregtech.api.util.GT_Multiblock_Tooltip_Builder; @@ -26,12 +27,11 @@ import net.minecraft.nbt.NBTTagCompound; import net.minecraft.util.EnumChatFormatting; import net.minecraft.util.StatCollector; import net.minecraftforge.fluids.FluidStack; -import org.apache.commons.lang3.ArrayUtils; import java.util.ArrayList; import java.util.Arrays; -import java.util.Collections; -import java.util.List; +import java.util.Objects; +import java.util.stream.Stream; import static com.gtnewhorizon.structurelib.structure.StructureUtility.ofBlock; import static gregtech.api.enums.GT_Values.VN; @@ -43,10 +43,12 @@ import static gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Basi public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMultiBlockBase<GT_MetaTileEntity_ProcessingArray> { + private GT_Recipe_Map mLastRecipeMap; private GT_Recipe mLastRecipe; private int tTier = 0; private int mMult = 0; private boolean mSeparate = false; + private String mMachineName = ""; public GT_MetaTileEntity_ProcessingArray(int aID, String aName, String aNameRegional) { super(aID, aName, aNameRegional); @@ -67,7 +69,7 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMu tt.addMachineType("Processing Array") .addInfo("Runs supplied machines as if placed in the world") .addInfo("Place up to 64 singleblock GT machines into the controller") - .addInfo("Note that tou still need to supply power to them all") + .addInfo("Note that you still need to supply power to them all") .addInfo("Use a screwdriver to enable separate input busses") .addInfo("Maximal overclockedness of machines inside: Tier 9") .addInfo("Doesn't work on certain machines, deal with it") @@ -142,8 +144,6 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMu return aStack != null && aStack.getUnlocalizedName().startsWith("gt.blockmachines.basicmachine."); } - private String mMachine = ""; - @Override public boolean checkRecipe(ItemStack aStack) { if (!isCorrectMachinePart(mInventory[1])) { @@ -152,18 +152,18 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMu GT_Recipe.GT_Recipe_Map map = getRecipeMap(); if (map == null) return false; - if (!mMachine.equals(mInventory[1].getUnlocalizedName())) { + if (!mMachineName.equals(mInventory[1].getUnlocalizedName())) { mLastRecipe = null; - mMachine = mInventory[1].getUnlocalizedName(); + mMachineName = mInventory[1].getUnlocalizedName(); } int machineTier = 0; if (mLastRecipe == null) { try { - int length = mMachine.length(); + int length = mMachineName.length(); - machineTier = Integer.parseInt(mMachine.substring(length - 2)); + machineTier = Integer.parseInt(mMachineName.substring(length - 2)); } catch (NumberFormatException ignored) { /* do nothing */ @@ -285,37 +285,43 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_CubicMu int tSize = tFOut.amount; tFOut.amount = tSize * i; } - tOut = clean(tOut); this.mMaxProgresstime = Math.max(1, this.mMaxProgresstime); - List<ItemStack> overStacks = new ArrayList<>(); - for (ItemStack itemStack : tOut) { - while (itemStack != null && itemStack.getMaxStackSize() < itemStack.stackSize) { - ItemStack tmp = itemStack.copy(); - tmp.stackSize = tmp.getMaxStackSize(); - itemStack.stackSize = itemStack.stackSize - itemStack.getMaxStackSize(); - overStacks.add(tmp); - } - } - if (!overStacks.isEmpty()) { - ItemStack[] tmp = new ItemStack[overStacks.size()]; - tmp = overStacks.toArray(tmp); - tOut = ArrayUtils.addAll(tOut, tmp); - } - List<ItemStack> tSList = new ArrayList<>(); - for (ItemStack tS : tOut) { - if (tS.stackSize > 0) tSList.add(tS); - } - tOut = tSList.toArray(new ItemStack[0]); - this.mOutputItems = tOut; + this.mOutputItems = Arrays.stream(tOut) + .filter(Objects::nonNull) + .flatMap(GT_MetaTileEntity_ProcessingArray::splitOversizedStack) + .filter(is -> is.stackSize > 0) + .toArray(ItemStack[]::new); this.mOutputFluids = new FluidStack[]{tFOut}; updateSlots(); return true; } - public static ItemStack[] clean(final ItemStack[] v) { - List<ItemStack> list = new ArrayList<>(Arrays.asList(v)); - list.removeAll(Collections.singleton(null)); - return list.toArray(new ItemStack[0]); + private static Stream<ItemStack> splitOversizedStack(ItemStack aStack) { + int tMaxStackSize = aStack.getMaxStackSize(); + if (aStack.stackSize <= tMaxStackSize) return Stream.of(aStack); + int tRepeat = aStack.stackSize / tMaxStackSize; + aStack.stackSize = aStack.stackSize % tMaxStackSize; + Stream.Builder<ItemStack> tBuilder = Stream.builder(); + tBuilder.add(aStack); + for (int i = 0; i < tRepeat; i++) { + ItemStack rStack = aStack.copy(); + rStack.stackSize = tMaxStackSize; + tBuilder.add(rStack); + } + return tBuilder.build(); + } + + @Override + public void onPostTick(IGregTechTileEntity aBaseMetaTileEntity, long aTick) { + super.onPostTick(aBaseMetaTileEntity, aTick); + if (mMachine && aTick % 20 == 0) { + GT_Recipe_Map tCurrentMap = getRecipeMap(); + if (tCurrentMap != mLastRecipeMap) { + for (GT_MetaTileEntity_Hatch_InputBus tInputBus : mInputBusses) tInputBus.mRecipeMap = tCurrentMap; + for (GT_MetaTileEntity_Hatch_Input tInputHatch : mInputHatches) tInputHatch.mRecipeMap = tCurrentMap; + mLastRecipeMap = tCurrentMap; + } + } } @Override diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png Binary files differindex b5c2580b3b..f733d56608 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png Binary files differindex 3280ff2d94..487acf190a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png Binary files differindex 285ca65ab3..af5f6354ec 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Chilly.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png Binary files differindex 3280ff2d94..94240958ac 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png Binary files differindex 285ca65ab3..d2f4a7afc5 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Corium.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png Binary files differindex 30698a2098..2949cb1ed1 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png Binary files differindex b5c2580b3b..ebfcec0c3c 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png Binary files differindex 3280ff2d94..55edeb92af 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png Binary files differindex 285ca65ab3..867a79cbf6 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Cucumber.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png Binary files differindex 3280ff2d94..73ffb6687e 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png Binary files differindex 285ca65ab3..e5a70a9f5a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Grape.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png Binary files differindex 30698a2098..165f88500c 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png Binary files differindex b5c2580b3b..aaf150ea44 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png Binary files differindex 3280ff2d94..2cec892752 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png Binary files differindex 285ca65ab3..c3b21254a8 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Lemon.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png Binary files differindex b5c2580b3b..1a50d6cf6a 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png Binary files differindex 3280ff2d94..cdb8595906 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png Binary files differindex 285ca65ab3..05b4be3323 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Onion.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png Binary files differindex b5c2580b3b..3793f02059 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png Binary files differindex 3280ff2d94..1a3df516b4 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png Binary files differindex 285ca65ab3..4318c12fff 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tea.4.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png Binary files differindex 30698a2098..8fcf68a843 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.1.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png Binary files differindex b5c2580b3b..af4aa79439 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.2.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png Binary files differindex 3280ff2d94..fa8cb16185 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.3.png diff --git a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png Binary files differindex 285ca65ab3..ab7236ab5e 100644 --- a/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png +++ b/src/main/resources/assets/ic2/textures/blocks/crop/blockCrop.Tomato.4.png |
