Skip to content

Commit

Permalink
🐛 再次修复气动工艺相关bug
Browse files Browse the repository at this point in the history
  • Loading branch information
warmthdawn committed Sep 28, 2021
1 parent 2d57749 commit 4c470b1
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 10 deletions.
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ dependencies {
deobfCompile "curse.maven:embersrekindled-${embers_version}"
deobfCompile "curse.maven:bloodmagic-${bloodmagic_version_curse}"
deobfCompile "curse.maven:thaumcraft-${thaumcraft_version}"
deobfCompile "curse.maven:mekanism-${mekanism_version}"

deobfCompile("codechicken:CodeChickenLib:${mc_version}-${ccl_version}:universal") {
exclude group: "mezz.jei"
Expand Down
3 changes: 2 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
# This is required to provide enough memory for the Minecraft decompilation process.
org.gradle.jvmargs=-Xmx3G
mod_version=0.7.7
mod_version=0.7.8
mc_version=1.12.2
mc_short=1.12
forge_version=14.23.5.2847
Expand Down Expand Up @@ -35,4 +35,5 @@ guideapi_version=228832:2645992
thaumcraft_version=223628:2629023
pneumaticcraft_repressurized_version=1.12.2-0.11.9-384
computercraft_version=67504:2478952
mekanism_version=268560:2835175
theoneprobe_version=1.12-1.4.28-17
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package com.warmthdawn.mod.gugu_utils.compat;

import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.IUpgradeAcceptorWrapper;
import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.TilePressureInputHatch;
import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.TilePressureOutputHatch;
import me.desht.pneumaticcraft.api.PneumaticRegistry;

public class PneumaticCraftCompat {
public static void postInit() {
PneumaticRegistry.getInstance().getItemRegistry().registerUpgradeAcceptor(new IUpgradeAcceptorWrapper(new TilePressureInputHatch()));
PneumaticRegistry.getInstance().getItemRegistry().registerUpgradeAcceptor(new IUpgradeAcceptorWrapper(new TilePressureOutputHatch()));

}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import com.warmthdawn.mod.gugu_utils.ModItems;
import com.warmthdawn.mod.gugu_utils.botania.SubtileRegisterOverride;
import com.warmthdawn.mod.gugu_utils.common.Enables;
import com.warmthdawn.mod.gugu_utils.compat.PneumaticCraftCompat;
import com.warmthdawn.mod.gugu_utils.config.TweaksConfig;
import com.warmthdawn.mod.gugu_utils.crafttweaker.CraftTweakerCompact;
import com.warmthdawn.mod.gugu_utils.gui.ModIndependentGuis;
Expand All @@ -15,12 +16,8 @@
import com.warmthdawn.mod.gugu_utils.handler.tweaks.EntropinnyumTNTHandler;
import com.warmthdawn.mod.gugu_utils.handler.tweaks.GaiaHandler;
import com.warmthdawn.mod.gugu_utils.modularmachenary.ModularMachenaryCompact;
import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.IUpgradeAcceptorWrapper;
import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.TilePressureInputHatch;
import com.warmthdawn.mod.gugu_utils.modularmachenary.pressure.TilePressureOutputHatch;
import com.warmthdawn.mod.gugu_utils.network.Messages;
import com.warmthdawn.mod.gugu_utils.psi.PsiCompact;
import me.desht.pneumaticcraft.api.PneumaticRegistry;
import net.minecraft.block.Block;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.Item;
Expand Down Expand Up @@ -96,8 +93,7 @@ public void postInit(FMLPostInitializationEvent event) {
}

if (Enables.PNEUMATICCRAFT) {
PneumaticRegistry.getInstance().getItemRegistry().registerUpgradeAcceptor(new IUpgradeAcceptorWrapper(new TilePressureInputHatch()));
PneumaticRegistry.getInstance().getItemRegistry().registerUpgradeAcceptor(new IUpgradeAcceptorWrapper(new TilePressureOutputHatch()));
PneumaticCraftCompat.postInit();
}

}
Expand Down
6 changes: 3 additions & 3 deletions version.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#Tue Sep 28 11:26:01 CST 2021
SAVED_VERSION=0.7.6
BUILD_NUMBER=5
#Tue Sep 28 21:08:46 CST 2021
SAVED_VERSION=0.7.7
BUILD_NUMBER=7

0 comments on commit 4c470b1

Please sign in to comment.