From d79bae783469b7c55f60d1d33804f155115ae4b6 Mon Sep 17 00:00:00 2001 From: Towdium Date: Fri, 26 Feb 2016 21:47:12 +0800 Subject: [PATCH] Add recipe and Chinese. --- build.gradle | 18 +++++++++++++---- .../JustEnoughCalculation.java | 13 +++++++++--- .../event/GuiEventHandler.java | 5 ++++- .../gui/commom/GuiTooltipScreen.java | 19 ++++++++++++++++++ .../gui/commom/recipe/GuiRecipe.java | 3 ++- .../item/ItemCalculator.java | 7 +------ .../network/PlayerHandlerClient.java | 2 +- .../assets/je_calculation/lang/en_US.lang | 5 ++--- .../assets/je_calculation/lang/zh_CN.lang | 15 ++++++++++++++ .../textures/gui/containerCalculator.png | Bin 15936 -> 0 bytes .../textures/gui/guiItemPicker.png | Bin 16365 -> 0 bytes .../textures/gui/slotActive.png | Bin 15681 -> 0 bytes .../je_calculation/textures/gui/slotInput.png | Bin 15681 -> 0 bytes .../textures/gui/slotOutput.png | Bin 16270 -> 0 bytes .../je_calculation/textures/gui/slots.png | Bin 16487 -> 0 bytes .../textures/items/itemCalculator.png | Bin 241 -> 17717 bytes src/main/resources/mcmod.info | 5 ++--- 17 files changed, 70 insertions(+), 22 deletions(-) create mode 100644 src/main/resources/assets/je_calculation/lang/zh_CN.lang delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/containerCalculator.png delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/guiItemPicker.png delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/slotActive.png delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/slotInput.png delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/slotOutput.png delete mode 100644 src/main/resources/assets/je_calculation/textures/gui/slots.png diff --git a/build.gradle b/build.gradle index f16b4a9..fbbeef9 100644 --- a/build.gradle +++ b/build.gradle @@ -20,14 +20,17 @@ plugins { id "net.minecraftforge.gradle.forge" version "2.0.2" } */ -version = "1.0" -group= "com.yourname.modid" // http://maven.apache.org/guides/mini/guide-naming-conventions.html -archivesBaseName = "modid" +version = "0.1.1" +group= "pers.towdium.justEnoughcalculation" // http://maven.apache.org/guides/mini/guide-naming-conventions.html +archivesBaseName = "je_calculation" + +sourceCompatibility = 1.7 +targetCompatibility = 1.7 minecraft { version = "1.8.9-11.15.1.1722" runDir = "run" - + useDepAts = true // the mappings can be changed at any time, and must be in the following format. // snapshot_YYYYMMDD snapshot are built nightly. // stable_# stables are built at the discretion of the MCP team. @@ -38,6 +41,7 @@ minecraft { } dependencies { + deobfCompile "mezz.jei:jei_1.8.9:2.28.2.166" // you may put jars on which you depend on in ./libs // or you may define them like so.. //compile "some.group:artifact:version:classifier" @@ -80,3 +84,9 @@ processResources exclude 'mcmod.info' } } + +repositories { + maven { + url "http://dvs1.progwml6.com/files/maven" + } +} diff --git a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java index df174ad..44a75db 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/JustEnoughCalculation.java @@ -1,8 +1,13 @@ package pers.towdium.justEnoughCalculation; +import net.minecraft.block.BlockStone; import net.minecraft.client.Minecraft; import net.minecraft.client.resources.model.ModelResourceLocation; +import net.minecraft.init.Blocks; +import net.minecraft.init.Items; +import net.minecraft.item.EnumDyeColor; import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; import net.minecraftforge.fml.common.Mod; import net.minecraftforge.fml.common.SidedProxy; import net.minecraftforge.fml.common.event.FMLInitializationEvent; @@ -24,7 +29,8 @@ import pers.towdium.justEnoughCalculation.network.packets.PacketSyncRecord; * @author Towdium */ -@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION) +@Mod(modid = JustEnoughCalculation.Reference.MODID, name = JustEnoughCalculation.Reference.MODNAME, version = JustEnoughCalculation.Reference.VERSION, + dependencies = "required-after:JEI@[1.8.9-2.28.2.166,)") public class JustEnoughCalculation { public static Item itemCalculator = new ItemCalculator().setUnlocalizedName("itemCalculator"); public static SimpleNetworkWrapper networkWrapper; @@ -38,8 +44,8 @@ public class JustEnoughCalculation { public static class Reference { public static final String MODID = "je_calculation"; - public static final String MODNAME = "JustEnoughCalculation"; - public static final String VERSION = "0.0.1"; + public static final String MODNAME = "Just Enough Calculation"; + public static final String VERSION = "0.1.1"; } @Mod.EventHandler @@ -59,6 +65,7 @@ public class JustEnoughCalculation { Minecraft.getMinecraft().getRenderItem().getItemModelMesher(). register(itemCalculator, 0, new ModelResourceLocation(Reference.MODID + ":" + itemCalculator.getUnlocalizedName().substring(5), "inventory")); } + GameRegistry.addRecipe(new ItemStack(itemCalculator), "SIS", "SRS", "SRS", 'S', new ItemStack(Blocks.stone, 1, 0), 'I', new ItemStack(Items.dye, 1, EnumDyeColor.BLACK.getDyeDamage()), 'R', Items.redstone); proxy.init(); } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java b/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java index af16bbf..2049083 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/event/GuiEventHandler.java @@ -60,11 +60,14 @@ public class GuiEventHandler { if (((GuiCalculator) event.gui).getActiveSlot() == 0){ Slot slot = ((GuiCalculator) event.gui).inventorySlots.getSlot(0); ItemStack itemStack = JEIPlugin.runtime.getItemListOverlay().getStackUnderMouse(); + if(itemStack != null){ + itemStack = itemStack.copy(); + } if(itemStack != null){ ItemStackWrapper.NBT.initNBT(itemStack); itemStack.getTagCompound().setBoolean("mark", true); } - slot.putStack(itemStack == null ? null : itemStack.copy()); + slot.putStack(itemStack == null ? null : itemStack); if (Mouse.isButtonDown(0)){ time = new Date().getTime(); Slot slot1 = ((GuiCalculator) event.gui).getSlotUnderMouse(); diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java index 4c3c70a..b1eb4b9 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/GuiTooltipScreen.java @@ -1,11 +1,15 @@ package pers.towdium.justEnoughCalculation.gui.commom; +import java.lang.reflect.Field; import java.util.ArrayList; import net.minecraft.client.gui.GuiButton; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.renderer.RenderHelper; +import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; /** * CODE IS DONE BY Zyin055 @@ -46,6 +50,21 @@ public abstract class GuiTooltipScreen extends GuiContainer super.drawScreen(mouseX, mouseY, f); RenderHelper.disableStandardItemLighting(); DrawTooltipScreen(mouseX, mouseY); + InventoryPlayer inventoryplayer = this.mc.thePlayer.inventory; + Field field; + Slot theSlot = null; + try { + field = GuiContainer.class.getDeclaredField("theSlot"); + field.setAccessible(true); + theSlot = (Slot) field.get(this); + } catch (Exception e) { + e.printStackTrace(); + } + if (inventoryplayer.getItemStack() == null && theSlot != null && theSlot.getHasStack()) + { + ItemStack itemstack1 = theSlot.getStack(); + this.renderToolTip(itemstack1, mouseX, mouseY); + } RenderHelper.enableStandardItemLighting(); } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java index e66b031..f86449d 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/gui/commom/recipe/GuiRecipe.java @@ -11,6 +11,7 @@ import net.minecraft.client.resources.model.ModelManager; import net.minecraft.inventory.Slot; import net.minecraft.item.ItemStack; import net.minecraft.util.ResourceLocation; +import net.minecraft.util.StatCollector; import pers.towdium.justEnoughCalculation.JustEnoughCalculation; import pers.towdium.justEnoughCalculation.core.ItemStackWrapper; import pers.towdium.justEnoughCalculation.core.Recipe; @@ -188,7 +189,7 @@ public class GuiRecipe extends GuiTooltipScreen{ @Override protected String GetButtonTooltip(int buttonId) { if(buttonId == 0){ - return "Switch between_pN: normal mode_pP: percentage mode"; + return StatCollector.translateToLocal("gui.calculator.tooltipUse"); }else { return null; } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java index 04b6ee8..3f31949 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/item/ItemCalculator.java @@ -1,5 +1,6 @@ package pers.towdium.justEnoughCalculation.item; +import net.minecraft.client.entity.EntityPlayerSP; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; @@ -23,10 +24,4 @@ public class ItemCalculator extends Item { playerIn.openGui(JustEnoughCalculation.instance, GuiHandler.GuiId.CALCULATOR, worldIn, 0, 0, 0); return itemStackIn; } - - @Override - public void addInformation(ItemStack stack, EntityPlayer playerIn, List tooltip, boolean advanced) { - //super.addInformation(stack, playerIn, tooltip, advanced); - tooltip.add("sdji"); - } } diff --git a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java index 1b3561b..a0226f8 100644 --- a/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java +++ b/src/main/java/pers/towdium/justEnoughCalculation/network/PlayerHandlerClient.java @@ -22,7 +22,7 @@ import java.util.UUID; * @author Towdium */ public class PlayerHandlerClient implements IPlayerHandler { - public List recipes; + public List recipes = new ArrayList<>(); @Override public void addRecipe(Recipe recipe, UUID uuid) { diff --git a/src/main/resources/assets/je_calculation/lang/en_US.lang b/src/main/resources/assets/je_calculation/lang/en_US.lang index 3457127..9a81a70 100644 --- a/src/main/resources/assets/je_calculation/lang/en_US.lang +++ b/src/main/resources/assets/je_calculation/lang/en_US.lang @@ -5,12 +5,11 @@ gui.calculator.output=Output gui.calculator.input=Input gui.calculator.catalyst=Catalyst gui.calculator.view=View -gui.calculator.editTooltip=Edit recorded recipes of selected item +gui.calculator.editTooltip=Edit recorded recipes of current item gui.calculator.addTooltip=Add preferred recipe gui.calculator.viewTooltip=View all recorded recipes -gui.itemPicker.confirm=Confirm -gui.itemPicker.search=Search gui.recipePicker.delete=Delete gui.recipeEditor.save=Save gui.recipeEditor.clear=Clear +gui.calculator.tooltipUse=Switch between_pN: normal mode_pP: percentage mode_pShift-click for quick change item.itemCalculator.name=Calculator diff --git a/src/main/resources/assets/je_calculation/lang/zh_CN.lang b/src/main/resources/assets/je_calculation/lang/zh_CN.lang new file mode 100644 index 0000000..b9f4c1c --- /dev/null +++ b/src/main/resources/assets/je_calculation/lang/zh_CN.lang @@ -0,0 +1,15 @@ +gui.calculator.calculate=开始计算吧! +gui.calculator.edit=编辑 +gui.calculator.add=添加 +gui.calculator.output=产出 +gui.calculator.input=材料 +gui.calculator.catalyst=催化 +gui.calculator.view=浏览 +gui.calculator.editTooltip=编辑当前物品的合成表记录 +gui.calculator.addTooltip=添加合成表 +gui.calculator.viewTooltip=浏览所有合成表记录 +gui.recipePicker.delete=删除 +gui.recipeEditor.save=储存 +gui.recipeEditor.clear=清除 +gui.calculator.tooltipUse=在不同模式下切换_pN: 普通模式_pP: 百分率模式_p按下shift一次改变10 +item.itemCalculator.name=合成计算器 diff --git a/src/main/resources/assets/je_calculation/textures/gui/containerCalculator.png b/src/main/resources/assets/je_calculation/textures/gui/containerCalculator.png deleted file mode 100644 index 127f3228b0cf93a1627c79b85b309eb348e46b62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15936 zcmeI3e{36P8OPtaDfI%45;45R^DHL-RjC7m{;wOh3fSkfUF$|!=O(eR$_ z*v=dKRRlx)^IEce&-=X3_qq4;KF{m>=l1pW-nG8r)&>B;`kwA^KLB;;vJTikgnsTz zpNyfOTTJ0OGsaz>ql<`J$xg374$uQRvDhQfM{+!S-xQRz{)8 zMB%WOY;*kOnP(l0rnWf-g$Nf(b;1#?dpr%djrR^HHY$BdC zq->ibuPdQzYnXK~`6=dTn`4WWkQs{fF`arEGJ;ERDx8~V{Gy8&1i#;XC*$ULFU#>P z?{V^?A%#}q$~Py@OOrq!6#AMPrqLspw(#57Y9%VsheSH|Pg)59z;iXzLoS-0DX zW;l&p(v-8#q|sUsS<(qZLrH5XQ`3`-r7K7EF|*C#uo9I%#dRf8r9?@i$PQ6tvvP{% zT^w62NL5NPsj+lCe`~73!Z=L8q-mfyzG_@*L^pL~M6Z#usvy|bav*eirGAM=xFi#qtGjg9yM0jEtIH2Y(=8G(;7PWbU)QZqyDVm55J zBFg#)EgbLL(8C@K`2@iu1X+9-kLc5~Fg_I4&^c^a=ZRZDM|VC5_f(DCUNf@7Q;aNZ zR>gx^z6%SZ=&=tyak8aH&J_(>I>$c9i}I2_NL5UWCc%J^O^S=m2lG-~7!a~aagq68 zUWy9?LN+NbG9S!KabZBnCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4Olj0)t z!Mqd~283)JkWGq<%m?#QTo@3tNpX?+U|xy~141?_E;1j?OL1X9$R@=_ z=7V`DE({3Sq`1g@FfYZ00U?_d7nu*{rMNI4WRv0|^TE6n7Y2lEQe0#{n3v+hfRIg! zi_8b}Qd}4ivPp4~`Cwj(3j;znDK0V}%u8`$K*%N$S3~(FPMAb*Zf4Lcn!h-;>$m9j zPDbhOj{q?KX#gfB0l2Y)-2c+54?Sv$-AGz3#U@_LhA3ciS2Rd#^8i z_hRU2!F7E88Y8}V^?3iyTkDSfefHw)<@jrJ`~LQg1O0EcZZ`^?oR7S9Iu^BKAY7pL}=CC(iLFwDjjMDPWI$W@b$>YI-sQPG4#G`Kc$xxnSG5d*7L~^|?Bxv`3;l z2925A`2Gzq{n7?(z`BbGu<~L81Z+)Ux^ofUaYmfGbmHU9;{0vR3!@7UPIb)vn46#P zn$8_-bwsy6bY9%_(}muYX_E+l21?_!Kcjz7OEUhjVV23q~b>-7lr`WAiW`;RHD2QyXq7Kt-pKib=C z2lEj2{ww&pz21pdHCQWctx6~s$(Mfc{$~5>2ljpQNdJY`o)+)BcKsG+$LYbx&uVx6 z`lAasU*0+JkKDxNL#Y$9$s0Sqa4Z;JXD3!c@h+v diff --git a/src/main/resources/assets/je_calculation/textures/gui/guiItemPicker.png b/src/main/resources/assets/je_calculation/textures/gui/guiItemPicker.png deleted file mode 100644 index 815359df145522b4b3d2ef8e99ed00433116dd7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16365 zcmeI3e{36P8OPr=7Ih=i&KjasS1QZZ(5mfnKYVBVu8z|Xw@nI8voxsbHjSR|UMHv6 zcgA;#ofNjPGCB~=y0w3FKZM4lX@ic6F+dfAZTvB{(n=--8f#12Z5>g!mZ7OY2dI?y z{5x;#cL6p{px2V+d*0`LzVG{f-sgSp{KtKBpnpqy+v+v|KzmHX z+O(BIXP~I7pli384fu;)oUzV8w>zMJI5FVwv2xHabx4fH3A{fnckq%F4hy&V1&$Y4 zj%WEG!^?^&Djer8e*&>KbQR6%DP=IexjY=QIs>DQlT}zYpU-#XgB@0Ggym&fW;uZs z1P1kB>`Bv63yf*6D~VKe;?UM|M%FPb)9>o4No(Bc3>#wQ@tg)XO`xT$YqWaDNYyrHo|5ZnI(JwwnuNKYQdlt+ zN;?!qYgKx3P<5=_kY%M~r7Rn$AoTb26tl{I(+S%4tTLJ`NK7Om>WnHvo)I)vQh81aha{xFAbf#z+|tI~(}JW+g+;eC zBww4Bq;Zm(3`H1S5JL>lLy1X7lBl$V!$~O0a!^l|b}Nxk>ckcdv@K_#x~Hb=`nYS+ z(O^L-f<$ttOPqg*alw(aoC z^II#9v{9^3Sv6-v_xyDRDhIGy(yA59jVYdEMb+He7Sr700nrrawbrIpjVy;53%7G| z2uk{O;mya$k3y4lyh>8VUd=^pE9K1YH!FNRmT0%VaPZ;zE2F3b3-x|Nb_h3gzB)IYq2ixsPufYFVs} zs^$pPV{Bz*m4^SNom*Tz{7(;1gL}*W!OoRV;{2Lesj~}fXw-eIP*D9vwLmS_JwD1V zXshK+ssFHBN7LiQ{<0*aI>+)H`jkWK-FWCua%jC953NOh(KMWxP#z6yu8VS?eM&dx z?dUNb#zK-5l%g!&j7JO@1(+U=8|V&dyLSRX3YCL!Ps7NaO(W|(<;c=z)jd)d>u0GI zJ+Pzy3T*Yy!h+ITy#sxi7qumQn5vi-9RveHHYqMLAIwW}VL-?x#YN_Wc_}Uo2-&2# z$b2v_#f1SOn-mwB59Xz~Fd$@;;v)0Gyc8D(gltk=WImXe;=+KCO^S=m2lG-~7!a~a zagq68UWy9?LN+NbG9S!KabZBnCdEbOgLx?~3<%kzxX64kFU5rcA)6EznGfcrxG*4O zlj0)t!Mqd~283)JkWGq<%m?#QTo@3tNpX?+U|xy~141?_E;1j?OL1X9 z$R@=_=7V`DE({3Sq`1g@FfYZ00U?`2Ty3@2Z=s3axy_@OYrlOi6hSZM`nBG{1OQVv z0x-P?fWKWszi$ID&H?bwE&!B60Iakg{L)LC0cd@pFWx;=ICbgFt>1rSME*mmiLuJbiX>{X_SyyX)N88=lX;x8>g555M{O_M_kU^TjQ(ZXwEdR+p*Y7>-+4Wqu>$?Zv{7h@X13ch5u+i;DxcDc` zuN#<^x32GB_U@`_b=A}FEx8{|1F!^mfxp4Uizg?pt)Ubzqsaxul>B0w6K<} z#}8g?Kk3!`uh@~9eH-VTu49`YJMb>}Df`&H`@(ZSo_)r5d;P>FZHf%A!pP){l!e?gOl_lk-TtX8vx+i bwN|jYEtGt4+ksyo6ZCEBk01Hmu6zCk(AACJ diff --git a/src/main/resources/assets/je_calculation/textures/gui/slotActive.png b/src/main/resources/assets/je_calculation/textures/gui/slotActive.png deleted file mode 100644 index 57470bd5c576a7993f6eb56cb9c1acb0a1442b85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15681 zcmeI3Pl()97{F62OI@sZ5X6EIrW6#LNnZZUBw=RicBge0oVsjBx;@#<%bVG_Gs&1_ zJF^RdtEYkriU-A`2%bE7D0om09;LSmp1dlG=N_bfN#;-H&CFwI3!=QhO!B?&ec$)q z?|bh{a>%W%E3cehJ+mqZ!s*S8`Zk=ONq(nR;QxbL&!2|V6a9_rksv(vL-IRu`=h-- z1)=h`*W8JB8n4-v#BtQJzgHe4soazRYH#Cz4kS`tv) zX>5t>K}bZSXh>L5kyy5h$S}%f^}MJmNS75PBTYh!jEai9$jHSLoBn>-O^4=UnRH2y_;CbwXrWzy zH;991H&_yKqFx#pa?)r_VlNzTueUIC6koat2u4U3T1L%-K9RRc6zqqXT)GKUIlE}~ zvDcm^XU0>aSvqzy^p=<L3vQ@SjbQ;hN{W z!616EBGV?*d{4cRx)YNctjCh1sFGqf6=W-xt(h+=CalVwldLD@qY=1X`(VZg(wnMg zt0f!hc^|o+v=7)nt`j@Q@{;eH^W$Q>9fUn6u6aGDL*%~SsmRmDT+hj>ve$!d5W=uX zO{>U@nipEt1H7Ls>op&f2$B)yk_4$rH||BJGut{=biGs$Y({Uw!)7IID`RTC6n=FGy!`}3x*n#P6)@#sE z^k8JVS#Fzc3rR*BmPNU&tCHC&AxYI*x~iKhZkr@s8?)xqk&RrBql4?k6W5g%w#sc+ zay7M`P25z70~ND`$_BC!G0`|s&e>d`*Fq1zv&6F^P#jd)#4!cT$XMmQbm68Qd zRM=Gyng*mblZOcfHt)Fb{(EUifM?P1uH$!zTa(8#8#nxyGIzXs_`sQ)zh(XpGMDYd z*_t@6v-35yk~}ThP=BEoIBDI3xg_Xp|l(q1%xefTx>p+mgAy;utkoG&4TzK zE;b)Z%W+Xa*doWp=0j;YE(!=+EL3lR!_>CVgL*LqF zeXTkCrS;97(%*MpK6j(n`|10~@Yc!4S61Nj%&q6%KV!c6>sLo#tbBOp)QR(V@7{g# k=;)}aJq@P!@1GPt`D5ke&tKlY0HUyY=}P_Ui#Oi=2Us5M=Kufz diff --git a/src/main/resources/assets/je_calculation/textures/gui/slotInput.png b/src/main/resources/assets/je_calculation/textures/gui/slotInput.png deleted file mode 100644 index 98441e688ee08703af9b899c012c2dd1aca01739..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15681 zcmeI3O^n+_6o6fdR%M}x0}@aP$x2m;iaPfACyA{jWxHwF6{M`TLEWC{WIV~5P3$!G zHrbVsSU6SuNFWZ}xga5NM&bY*I3jL6aNf8h{IJ`D-k`fU>|wG;Be_Z2o?prR@$Gjx*>fwo>sDQ>_txpI zw{h5~*AA~X$l)Hb-Q30MYI*2@gD#D*JnVM-&>2>8iC+h<<7PD{CtaewN^UIj;6_@BUfF8t8(9MIoq`>qi`Tq za=TH~b5wOO7~}^=KIpeqWZSl?>8h?P&_f9i{0I*fKRlZ{8T+Zxko3J?(8e!r6p%_S=B&@T0(5bV%GyWVaP z1>tV6B;-WBG%)0(UZ2EXINok|VdyZrd>asqkS??g8wWkAZqqQ>?-P3YHcaL0qS;4Y zYnq%HPqAj{*y+$)Vis#svt%ix87jkEo%KG&QP6J$L8qFovaK;fd3`-uRq{*MJ>Lxm z;rX)4noRRO^+szrqE%Rr1x3>pt<=zvquGv8dRZ&Ms?0b^don)if$OynW_%#Cp&O2F zIS6HaWO}kbVE?!{!pHKG?VIuA5~mgPyEv+PUEHQ>&u^F2X=A46WK}uqK_}?LuxQmN ztBaZ!TGaxwA1~`QpU@DJ5oVGEsY*8PCET8E9VWB^uq|lbT(^MXvljo zG7Z@U+QLNznV~O7EsYbHligo4wP{=7wC$X3U3ehLmHQrN^V?NCY2hxPL6U?o*Yc# zl3gY7uBR}>nbzsBSTk=voyS9v`p=jzk1^P#KCfz|u99BMorFOv8sI)%Yr}pzPC-k( z&YH3A7w-~alr@KmScH2?iH zAfpjKOlXcdDc=8H8e-sSbh3;6Hg&7&cxK~<|5E0TR}a$(|AWlU-!lIPnM-%#Y)u^3 z+4&k;j-QqssJ~DPa8mc6?$5PN*G$@fC$6KN{iMHb*-+QQ+e9VYC7l z1B5RMTzo!^R^VcQ@I`@(&xg?pTnrGtC~)!lFj|3&0m2srEF03#Q@=p0vDeT zqZPOqAbe5a;`3p&0v7{>FA7|IK8#l2Vu0{Pfs4D~7w>CXpn{!NnhHA%X6Q<9v|CF!}~)3<)S0)4BSwYA3Z zm!|n-{{GLeoV(fW{`CE0Wb5SPD=YAM=GF@zo+-Wk>z7AgtbBat)QJms@7{gt=;)|n gJOic=9-Ne3yT2lT_SLNqK$JEwU#)$8>E?TX0gYPgg8%>k diff --git a/src/main/resources/assets/je_calculation/textures/gui/slotOutput.png b/src/main/resources/assets/je_calculation/textures/gui/slotOutput.png deleted file mode 100644 index e3249361247154a18aef948bac99b0ee85de3a64..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16270 zcmeI3O^Do79Kc^|sdZ^pR21qZOtn~RCf_qjn4NaJvvn6c+hup8TM=v~c{3Y!CK;1# zXLdncECnkbv?3^iR|`Um;Gy85_E2wLrHGf}$uIQaMHK2wG9Q^Ynb*}WNaY2F$^ZSo z-uwMu{z(qGurUApzKQ)40DygSv!z7lfEDjBQP3PAO%+ z+?s|f_UwiSmp0}r=Ekb2S(zini9$z50h%x{m`=0d_*f933OKQteU=9 zI^Io(q{+-m5VUlTYq#6kwv=_fIwxqF#_=L2iY&5V{dFfWI;`U#h=cUvl%Q{Vb}O)5 zhY8~vRd+3z%w)nu{iD0CW~-mb@w@C0MXqDCI3de(X-<~e_i3$pjc96?$-xF}LMQN% zpOEU;T5$u{UvbBz?5oEnMl~sy`?*u++ia$$_Jf(T2tgNVs;6IBZ$WMm`tF)%!kM#Z zDF@P4AK0})afTv=nz3_-9ea#hsEOU8tq@nJfYz!{d(a46uj0CmV!X>1dI*{6>1bCm z&z!Oy%WeCI3LNe-sP`ZmEExeTqWzd-d6DJS3NPrqrc3H!UPZey5hS+6Vw7FWuB{Kn z5R?kf>w>I{`DBcQB_0D^Kb8>~TZ)pjO~kQGz29Na zMm49hmMG^~L4XQdRja6R8ocRaleRnr5o1Qk69+hoFtP4`$X4-OG+br!SnZ zih`U|1lE$oTD)+ThX(4HIU%nIngCUymnaczB+*IFM(x~aBy7U9SkYQkL{HFIL&|Hc zsmOU&Q-msO2(n?;^0KLzRxd?Ln2}Voc3AgytPEjomf)+yql3CfjkjfZJ`CH+WTw|w z`kfk?_K!l;o^-24I5aw#7Vc)Jm2)cy;`j;o@j2Qn&>?k=I8@Qt%~SB9L-3xX-BtZAanE?Tn8s#P96 z15_m`7jAec!d{vGc^L$$5DJm!M z=;*p8)wt_vvTIU}yAC{GbnKugcC%r_39s;xE`HuvLT?|im{Sx%Rky+~fLppzS;vENMHV zVzFov3Vor!L$??281k9Tx33&mg2&IkVT4% z%m>p_To@3tNO6(*U|Na`140%lE;1iXOL1X9$Rfo>=7VV|E({1+q`1g@FfGM}0U?VN z7nu*HrMNI4WRc<`^TD(f7Y2kZQe0#{n3m$gfRIIsi_8bpQd}4ivPf}}`CwX#3j;zH zDK0V}OiOWLK*%D+MdpKPDJ~2MS){ngd@wD=g#jUp6c?Efrlq(rAY_r^BJ;tt6c+}B zED~`|48AIc4*Hb1jlLPae(=oa=zC+voLwvfu<w+>ypdG7u4jopu3xccO+7uGL+ z^!raYKYi_~%u64)-7g>c>d)4-cRqal{Q1T~^l9`i@Gv+Uej`2ZWOM!PH-CHYp}#6u zo;|$z=$)(yfl^iD^QM}Qn`F}X9te39oB%t)9>9Q2RK@K%*}h2q8QnP~|H=IT+`fGu Z_~!e)GfQ7zxeU-TH#1+leC*5{e*+!#9V`F< diff --git a/src/main/resources/assets/je_calculation/textures/gui/slots.png b/src/main/resources/assets/je_calculation/textures/gui/slots.png deleted file mode 100644 index 37b5cd0f0540ef49bc4f5deb921f4bdf934b6854..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 16487 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 DDW;a8 delta 214 zcmV;{04e{qiUIKfkR*S&Nkl7;r&mMW*0g3|Ma*0vY7J!O~P{j4MbT; za{)*r2!D{&_#dLe3C3H12G#P4fH6VMAdUZJwBZ<}8Aihl!fOCnT z0D*aeQecJ18j02nGXNG{AWbj~(@f9+5CAEFDK-^n1!JN$BO8LO7@dy{0PSPzdy=!L QZvX%Q07*qoM6N<$f