diff --git a/build.gradle b/build.gradle index dc4a6bb..a35ac87 100644 --- a/build.gradle +++ b/build.gradle @@ -373,7 +373,7 @@ catch (Exception ignored) { // Pulls version first from the VERSION env and then git tag String identifiedVersion = null -String versionOverride = '0.0.17p13' +String versionOverride = '0.0.17p14' try { // Produce a version based on the tag, or for branches something like 0.2.2-configurable-maven-and-extras.38+43090270b6-dirty if (versionOverride == null) { diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java index 70b552c..2f4893a 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/DualInputHatch.java @@ -1944,7 +1944,7 @@ public ItemStack[] getItems(){ ArrayList all=new ArrayList<>(); all.addAll(circuitInv); all.addAll(cachedItems); - + all.add(mInventory[getCircuitSlot()]); return all.toArray(new ItemStack[0]); } diff --git a/src/main/java/reobf/proghatches/gt/metatileentity/multi/LargeProgrammingCircuitProvider.java b/src/main/java/reobf/proghatches/gt/metatileentity/multi/LargeProgrammingCircuitProvider.java index e7fbfa1..7872dff 100644 --- a/src/main/java/reobf/proghatches/gt/metatileentity/multi/LargeProgrammingCircuitProvider.java +++ b/src/main/java/reobf/proghatches/gt/metatileentity/multi/LargeProgrammingCircuitProvider.java @@ -852,6 +852,7 @@ public void powerChange(MENetworkChannelsChanged w){ } @Override public void provideCrafting(ICraftingProviderHelper craftingTracker) { + if(mStartUpCheck>0)return; if (cacheState == CacheState.DIRTY) { updateCache(); cacheState = CacheState.FRESHLY_UPDATED; diff --git a/src/main/java/reobf/proghatches/item/ItemUpgrades.java b/src/main/java/reobf/proghatches/item/ItemUpgrades.java index 784b8d9..98fb4d7 100644 --- a/src/main/java/reobf/proghatches/item/ItemUpgrades.java +++ b/src/main/java/reobf/proghatches/item/ItemUpgrades.java @@ -72,7 +72,7 @@ public static int mark(int i){ @Override public void registerIcons(IIconRegister register) { icons[mark(0)] = register.registerIcon("proghatches:upgrade0"); - icons[mark(1)] = register.registerIcon("proghatches:upgrade0"); - icons[mark(2)] = register.registerIcon("proghatches:upgrade0"); + icons[mark(1)] = register.registerIcon("proghatches:upgrade1"); + icons[mark(2)] = register.registerIcon("proghatches:upgrade2"); } } diff --git a/src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java b/src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java index 2354b6b..c5ac93f 100644 --- a/src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java +++ b/src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java @@ -86,7 +86,8 @@ public void acceptTargets(Set myTargets, Set otherTargets) { @SuppressWarnings("unused") @Override public List getMixins() { - + + boolean ff=true; File f = new File(System.getProperty("user.dir") + File.separator + "config", "proghatches.mixin.properties"); if (f.exists() == false) { @@ -138,58 +139,57 @@ public List getMixins() { if (!"true".equals(pp.get("noFixRecursiveCraft"))) - retLate.add("eucrafting." + "MixinCraftingRecursiveWorkaround"); + if(ff)retLate.add("eucrafting." + "MixinCraftingRecursiveWorkaround"); if (!"true".equals(pp.get("noEUCraftingMixins"))) { - retLate.add("eucrafting." + "MixinMachineIdle"); - retLate.add("eucrafting." + "MixinMachineIdle2"); - retLate.add("eucrafting." + "MixinCpuClusterEUAutoRequest"); - retLate.add("eucrafting." + "MixinRemoveExcessiveEU"); - retLate.add("eucrafting." + "MixinCoverInsertion"); - retLate.add("eucrafting." + "MixinEUSourceCoverChunkUnloadNotification"); - } + if(ff)retLate.add("eucrafting." + "MixinMachineIdle"); + if(ff)retLate.add("eucrafting." + "MixinMachineIdle2"); + if(ff)retLate.add("eucrafting." + "MixinCpuClusterEUAutoRequest"); + if(ff)retLate.add("eucrafting." + "MixinRemoveExcessiveEU"); + + if(ff)retLate.add("eucrafting." + "MixinEUSourceCoverChunkUnloadNotification"); + } + if(ff) retLate.add("eucrafting." + "MixinCoverInsertion"); if (FMLLaunchHandler.side().isClient()) { - retLate.add("eucrafting." + "MixinWirelessRename"); + if(ff)retLate.add("eucrafting." + "MixinWirelessRename"); } - retLate.add("eucrafting." + "MixinInvTracker"); + if(ff)retLate.add("eucrafting." + "MixinInvTracker"); - retLate.add("MixinFixPipeCoverBug"); - retLate.add("MixinFixPipeCoverBug2"); + if(ff)retLate.add("MixinFixPipeCoverBug"); + if(ff)retLate.add("MixinFixPipeCoverBug2"); - retLate.add("MixinAEAdaptorSkipStackSizeCheck"); - retLate.add("MixinAwarenessForDualHatch"); + if(ff)retLate.add("MixinAEAdaptorSkipStackSizeCheck"); + if(ff)retLate.add("MixinAwarenessForDualHatch"); if (!"true".equals(pp.get("noRemoveUnusedCacheInModularUIContainer"))) - retLate.add("MixinRemoveUnunsedItemStackCache"); - retLate.add("MixinAE2FCCompat"); + if(ff)retLate.add("MixinRemoveUnunsedItemStackCache"); + if(ff)retLate.add("MixinAE2FCCompat"); if (!"true".equals(pp.get("noRecipeFilterForDualHatch"))) { - retLate.add("MixinGTRecipeFilter"); + if(ff)retLate.add("MixinGTRecipeFilter"); // GT Multiblock will not set recipe filter of DualInputHatch, set // it via mixin - retLate.add("MixinAddProgCircuitExemptToInputFilter"); + if(ff)retLate.add("MixinAddProgCircuitExemptToInputFilter"); } // Crafting CPU cannot recognize empty-input pattern // bypass the check anyway retLate.add("MixinCanCraftExempt"); - retLate.add("MixinNoFuzzyForProgrammingCircuit"); - retLate.add("MixinHandleProgrammingOnRecipeStart"); - //if(!"true".equals(pp.get("noMigrateProgrammingCircuitMixin"))) - // ret.add("MixinCircuitMigration"); + if(ff)retLate.add("MixinNoFuzzyForProgrammingCircuit"); + if(ff)retLate.add("MixinHandleProgrammingOnRecipeStart"); if (FMLLaunchHandler.side().isClient()) { if (!"true".equals(pp.get("noAEItemSortMixins"))) - retLate.add("MixinAEItemStackCompare"); + if(ff)retLate.add("MixinAEItemStackCompare"); if (!"true".equals(pp.get("noFixTossBug"))) - ret.add("MixinFixTossWhenClickSlot"); + if(ff)ret.add("MixinFixTossWhenClickSlot"); if (!"true".equals(pp.get("noPatternEncodingMixin"))) { - retLate.add("MixinPatternEncodingCiruitSpecialTreatment");// For + if(ff)retLate.add("MixinPatternEncodingCiruitSpecialTreatment");// For // ae2fc // pattern // encoder - retLate.add("MixinPatternEncodingCiruitSpecialTreatment2"); // For + if(ff)retLate.add("MixinPatternEncodingCiruitSpecialTreatment2"); // For // nee // pattern // encoder diff --git a/src/main/java/reobf/proghatches/main/registration/ProgHatchCreativeTab.java b/src/main/java/reobf/proghatches/main/registration/ProgHatchCreativeTab.java index 7671378..5727205 100644 --- a/src/main/java/reobf/proghatches/main/registration/ProgHatchCreativeTab.java +++ b/src/main/java/reobf/proghatches/main/registration/ProgHatchCreativeTab.java @@ -48,6 +48,11 @@ public void displayAllReleventItems(List p_78018_1_) { p_78018_1_.add(new ItemStack(MyMod.pitem, 1)); p_78018_1_.add(new ItemStack(MyMod.pstation, 1)); p_78018_1_.add(new ItemStack(MyMod.plunger, 1)); + + p_78018_1_.add(new ItemStack(MyMod.upgrades, 1, 0)); + p_78018_1_.add(new ItemStack(MyMod.upgrades, 1, 1)); + p_78018_1_.add(new ItemStack(MyMod.upgrades, 1, 2)); + // p_78018_1_.add(new ItemStack(MyMod.euupgrade, 1)); } diff --git a/src/main/resources/assets/proghatches/lang/zh_CN.lang b/src/main/resources/assets/proghatches/lang/zh_CN.lang index 2ba7dd4..f9b425d 100644 --- a/src/main/resources/assets/proghatches/lang/zh_CN.lang +++ b/src/main/resources/assets/proghatches/lang/zh_CN.lang @@ -435,8 +435,9 @@ item.proghatch.upgrades.tooltips.1.3=拆卸输入仓回收已安装的升级 item.proghatch.upgrades.1=ME物品库存升级 programmable_hatches.gt.item.pull.me.0=标记物品以从ME存储拉取物品 programmable_hatches.gt.item.pull.me.1=访问相邻接口的ME存储 +item.proghatch.upgrades.2=ME流体库存升级 item.proghatch.upgrades.tooltips.2=4 -item.proghatch.upgrades.tooltips.2.0=Right click a Dual Input Hatch to install. -item.proghatch.upgrades.tooltips.2.1=Each installed Upgrade provides an extra ME Item slot. -item.proghatch.upgrades.tooltips.2.2=1 Upgrade acceptable at max -item.proghatch.upgrades.tooltips.2.3=Harvest the Hatch to retrieve installed Upgrades. +item.proghatch.upgrades.tooltips.2.0=右键一个二合一输入仓以安装升级 +item.proghatch.upgrades.tooltips.2.1=每个升级增加一个ME流体槽 +item.proghatch.upgrades.tooltips.2.2=最多安装 1 个 +item.proghatch.upgrades.tooltips.2.3=拆卸输入仓回收已安装的升级 diff --git a/src/main/resources/assets/proghatches/textures/items/upgrade2.png b/src/main/resources/assets/proghatches/textures/items/upgrade2.png new file mode 100644 index 0000000..e676814 Binary files /dev/null and b/src/main/resources/assets/proghatches/textures/items/upgrade2.png differ