Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
reobf committed Jul 24, 2024
1 parent dac5ea0 commit 4528eab
Show file tree
Hide file tree
Showing 8 changed files with 42 additions and 35 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1944,7 +1944,7 @@ public ItemStack[] getItems(){
ArrayList<ItemStack> all=new ArrayList<>();
all.addAll(circuitInv);
all.addAll(cachedItems);

all.add(mInventory[getCircuitSlot()]);
return all.toArray(new ItemStack[0]);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/reobf/proghatches/item/ItemUpgrades.java
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}
}
54 changes: 27 additions & 27 deletions src/main/java/reobf/proghatches/main/mixin/MixinPlugin.java
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,8 @@ public void acceptTargets(Set<String> myTargets, Set<String> otherTargets) {
@SuppressWarnings("unused")
@Override
public List<String> getMixins() {


boolean ff=true;

File f = new File(System.getProperty("user.dir") + File.separator + "config", "proghatches.mixin.properties");
if (f.exists() == false) {
Expand Down Expand Up @@ -138,58 +139,57 @@ public List<String> 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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down
9 changes: 5 additions & 4 deletions src/main/resources/assets/proghatches/lang/zh_CN.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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=拆卸输入仓回收已安装的升级
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 4528eab

Please sign in to comment.