From 7022dcd1af82499727635b12158b3e2486d61c9e Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Fri, 28 Jun 2024 14:37:28 -0500 Subject: [PATCH 1/3] fix issues with artillery proxy OC compat also fix a big sound system issue where other mods would run out of sound memory on the sound card if they loaded after NTM reserved 1000 CHANNELS --- .../java/com/hbm/config/GeneralConfig.java | 4 ++ .../java/com/hbm/handler/CompatHandler.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 2 +- .../bomb/TileEntityLaunchPadBase.java | 5 +- .../machine/storage/TileEntityBarrel.java | 7 ++- .../storage/TileEntityMachineFluidTank.java | 6 +- .../turret/TileEntityTurretArty.java | 56 +++++++++++++++++++ 7 files changed, 75 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index 321d349e1..bb3a85317 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -36,6 +36,7 @@ public class GeneralConfig { public static boolean enableSteamParticles = true; public static boolean enableSoundExtension = true; public static boolean enableMekanismChanges = true; + public static int normalSoundChannels = 100; public static int hintPos = 0; public static boolean enableExpensiveMode = false; @@ -105,6 +106,9 @@ public class GeneralConfig { enableSteamParticles = config.get(CATEGORY_GENERAL, "1.38_enableSteamParticles", true, "If disabled, auxiliary cooling towers and large cooling towers will not emit steam particles when in use.").getBoolean(true); enableSoundExtension = config.get(CATEGORY_GENERAL, "1.39_enableSoundExtension", true, "If enabled, will change the limit for how many sounds can play at once.").getBoolean(true); enableMekanismChanges = config.get(CATEGORY_GENERAL, "1.40_enableMekanismChanges", true, "If enabled, will change some of Mekanism's recipes.").getBoolean(true); + normalSoundChannels = CommonConfig.createConfigInt(config, CATEGORY_GENERAL, "1.41_normalSoundChannels", + "The amount of channels to create while 1.39_enableSoundExtension is enabled.\n" + + "Note that a value below 28 or above 200 can cause buggy sounds and issues with other mods running out of sound memory.", 100); enableExpensiveMode = config.get(CATEGORY_GENERAL, "1.99_enableExpensiveMode", false, "It does what the name implies.").getBoolean(false); diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index 552acfe33..22ede1513 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -99,7 +99,7 @@ public class CompatHandler { player.addChatComponentMessage(new ChatComponentTranslation(info).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))); } TileEntity te = (TileEntity) this; - if(Array.getLength(this.methods()) == 0 && te instanceof TileEntityProxyCombo || this.getComponentName().equals("ntm_null")) + if((Array.getLength(this.methods()) == 0 && te instanceof TileEntityProxyCombo) || this.getComponentName().equals("ntm_null")) player.addChatComponentMessage(new ChatComponentTranslation("analyze.error").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED))); return null; } diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index ee1339949..a5130b788 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -152,7 +152,7 @@ public class ClientProxy extends ServerProxy { Jars.initJars(); if(GeneralConfig.enableSoundExtension) { - SoundSystemConfig.setNumberNormalChannels(1000); + SoundSystemConfig.setNumberNormalChannels(GeneralConfig.normalSoundChannels); SoundSystemConfig.setNumberStreamingChannels(50); } } diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java index 7624b53d5..2eeb90a16 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java @@ -548,8 +548,7 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl return getTier(context, args); case ("launch"): return launch(context, args); - } + } throw new NoSuchMethodException(); -} - + } } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index dc7e5ec20..a02f39e62 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java @@ -431,7 +431,12 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc @Override public String[] methods() { - return new String[] {"getFluidStored", "getMaxStored", "getTypeStored", "getInfo"}; + return new String[] { + "getFluidStored", + "getMaxStored", + "getTypeStored", + "getInfo" + }; } @Override diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java index f963cb359..db9014fdb 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java @@ -518,7 +518,11 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements @Override public String[] methods() { - return new String[] {"getFluidStored", "getMaxStored", "getTypeStored", "getInfo"}; + return new String[] { + "getFluidStored", + "getMaxStored", + "getTypeStored", + "getInfo"}; } @Override diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java index fcea913b7..7893602c0 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java @@ -477,4 +477,60 @@ public class TileEntityTurretArty extends TileEntityTurretBaseArtillery implemen targetQueue.add(Vec3.createVectorHelper(args.checkDouble(0), args.checkDouble(1), args.checkDouble(2))); return new Object[] {true}; } + + @Override + public String[] methods() { // :vomit: + return new String[] { + "setActive", + "isActive", + "getEnergyInfo", + "getWhitelisted", + "addWhitelist", + "removeWhitelist", + "setTargeting", + "getTargeting", + "hasTarget", + "getAngle", + "isAligned", + "getCurrentTarget", + "getTargetDistance", + "addCoords" + }; + } + + @Override + public Object[] invoke(String method, Context context, Arguments args) throws Exception { + switch (method) { + case "setActive": + return setActive(context, args); + case "isActive": + return isActive(context, args); + case "getEnergyInfo": + return getEnergyInfo(context, args); + case "getWhitelisted": + return getWhitelisted(context, args); + case "addWhitelist": + return addWhitelist(context, args); + case "removeWhitelist": + return removeWhitelist(context, args); + case "setTargeting": + return setTargeting(context, args); + case "getTargeting": + return getTargeting(context, args); + case "hasTarget": + return hasTarget(context, args); + case "getAngle": + return getAngle(context, args); + case "isAligned": + return isAligned(context, args); + case "getCurrentTarget": + return getCurrentTarget(context, args); + case "getTargetDistance": + return getTargetDistance(context, args); + case "addCoords": + return addCoords(context, args); + } + throw new NoSuchMethodException(); + } + } From e1226c94be8755a8a6192f5591d4fbc27055849d Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Tue, 2 Jul 2024 02:44:06 -0500 Subject: [PATCH 2/3] sowwy --- src/main/java/com/hbm/blocks/network/BlockCableGauge.java | 1 + src/main/java/com/hbm/blocks/network/FluidDuctGauge.java | 1 + src/main/java/com/hbm/handler/CompatHandler.java | 6 ++++++ src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java | 5 +++++ .../com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java | 4 ++++ .../java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java | 5 +++++ .../java/com/hbm/tileentity/machine/TileEntityChungus.java | 5 +++++ .../com/hbm/tileentity/machine/TileEntityCoreEmitter.java | 1 + .../com/hbm/tileentity/machine/TileEntityCoreInjector.java | 1 + .../com/hbm/tileentity/machine/TileEntityCoreReceiver.java | 1 + .../hbm/tileentity/machine/TileEntityCoreStabilizer.java | 1 + .../java/com/hbm/tileentity/machine/TileEntityGeiger.java | 1 + src/main/java/com/hbm/tileentity/machine/TileEntityICF.java | 5 +++++ .../java/com/hbm/tileentity/machine/TileEntityITER.java | 5 +++++ .../tileentity/machine/TileEntityMachineLargeTurbine.java | 5 +++++ .../hbm/tileentity/machine/TileEntityMachineRadarNT.java | 5 +++++ .../machine/TileEntityMachineReactorBreeding.java | 1 + .../hbm/tileentity/machine/TileEntityMachineTurbine.java | 1 + .../hbm/tileentity/machine/TileEntityMachineTurbineGas.java | 5 +++++ .../com/hbm/tileentity/machine/TileEntityMicrowave.java | 1 + .../com/hbm/tileentity/machine/TileEntityPWRController.java | 1 + .../hbm/tileentity/machine/TileEntityReactorControl.java | 1 + .../hbm/tileentity/machine/TileEntityReactorResearch.java | 5 +++++ .../com/hbm/tileentity/machine/TileEntityReactorZirnox.java | 5 +++++ .../hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java | 1 + .../hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java | 1 + .../hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java | 1 + .../hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java | 1 + .../hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java | 1 + .../hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java | 1 + .../tileentity/machine/rbmk/TileEntityRBMKOutgasser.java | 1 + .../com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java | 1 + .../hbm/tileentity/machine/storage/TileEntityBarrel.java | 3 +++ .../machine/storage/TileEntityMachineBattery.java | 1 + .../machine/storage/TileEntityMachineFluidTank.java | 3 +++ .../com/hbm/tileentity/network/TileEntityRadioTelex.java | 1 + .../com/hbm/tileentity/turret/TileEntityTurretArty.java | 2 ++ .../tileentity/turret/TileEntityTurretBaseArtillery.java | 1 + .../com/hbm/tileentity/turret/TileEntityTurretBaseNT.java | 4 ++++ 39 files changed, 95 insertions(+) diff --git a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java index 67da0e324..bc31744fd 100644 --- a/src/main/java/com/hbm/blocks/network/BlockCableGauge.java +++ b/src/main/java/com/hbm/blocks/network/BlockCableGauge.java @@ -143,6 +143,7 @@ public class BlockCableGauge extends BlockContainer implements IBlockMultiPass, } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_power_gauge"; } diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java index 613337412..2c60fbc59 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctGauge.java @@ -153,6 +153,7 @@ public class FluidDuctGauge extends FluidDuctBase implements IBlockMultiPass, IL this.deltaLastSecond = Math.max(nbt.getLong("deltaS"), 0); } + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_fluid_gauge"; } diff --git a/src/main/java/com/hbm/handler/CompatHandler.java b/src/main/java/com/hbm/handler/CompatHandler.java index 22ede1513..ec0250c81 100644 --- a/src/main/java/com/hbm/handler/CompatHandler.java +++ b/src/main/java/com/hbm/handler/CompatHandler.java @@ -67,6 +67,7 @@ public class CompatHandler { * @return String */ @Override + @Optional.Method(modid = "OpenComputers") default String getComponentName() { return "ntm_null"; } @@ -77,6 +78,7 @@ public class CompatHandler { * @return If the side should be able to connect. */ @Override + @Optional.Method(modid = "OpenComputers") default boolean canConnectNode(ForgeDirection side) { return true; } @@ -85,9 +87,11 @@ public class CompatHandler { * Function to give more information when analyzing the block. Multiple entries in the array will be sent to the user in the order of the array. * @return Additional text to add in the form of lang entries (ex: "analyze.basic2"). */ + @Optional.Method(modid = "OpenComputers") default String[] getExtraInfo() {return new String[] {"analyze.noInfo"};} @Override + @Optional.Method(modid = "OpenComputers") default Node[] onAnalyze(EntityPlayer player, int side, float hitX, float hitY, float hitZ) { player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic1").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.GOLD))); player.addChatComponentMessage(new ChatComponentTranslation("analyze.basic2").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW))); @@ -109,6 +113,7 @@ public class CompatHandler { * @return Array of methods to expose to the computer. */ @Override + @Optional.Method(modid = "OpenComputers") default String[] methods() {return new String[0];} /** @@ -116,6 +121,7 @@ public class CompatHandler { * @return Data to the computer as a return from the function. */ @Override + @Optional.Method(modid = "OpenComputers") default Object[] invoke(String method, Context context, Arguments args) throws Exception {return null;} } } diff --git a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java index f550af4b8..a2ac9ba74 100644 --- a/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java +++ b/src/main/java/com/hbm/tileentity/TileEntityProxyCombo.java @@ -548,6 +548,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy } @Override // please work + @Optional.Method(modid = "OpenComputers") public String getComponentName() { if(this.getTile() instanceof OCComponent) return ((OCComponent) this.getTile()).getComponentName(); @@ -555,6 +556,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy } @Override + @Optional.Method(modid = "OpenComputers") public boolean canConnectNode(ForgeDirection side) { //thank you vaer if(this.getTile() instanceof OCComponent) return (this.getTile().getBlockMetadata() & 6) == 6 && ((OCComponent) this.getTile()).canConnectNode(side); @@ -562,6 +564,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy } @Override + @Optional.Method(modid = "OpenComputers") public String[] getExtraInfo() { if(this.getTile() instanceof OCComponent) return new String[] {"analyze.dummy"}; @@ -569,6 +572,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { if(this.getTile() instanceof OCComponent) return ((OCComponent) this.getTile()).methods(); @@ -576,6 +580,7 @@ public class TileEntityProxyCombo extends TileEntityProxyBase implements IEnergy } @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { if(this.getTile() instanceof OCComponent) return ((OCComponent) this.getTile()).invoke(method, context, args); diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java index 2eeb90a16..ea1974511 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchPadBase.java @@ -472,6 +472,7 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_launch_pad"; } @@ -526,6 +527,7 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getEnergyInfo", @@ -536,6 +538,8 @@ public abstract class TileEntityLaunchPadBase extends TileEntityMachineBase impl }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getEnergyInfo"): diff --git a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index b193f0cb1..a3dfea4ae 100644 --- a/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/src/main/java/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -649,6 +649,7 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_custom_launch_pad"; } @@ -714,6 +715,8 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide return new Object[] {false}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getEnergyInfo", @@ -725,6 +728,8 @@ public class TileEntityLaunchTable extends TileEntityLoadedBase implements ISide }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getEnergyInfo"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java index 874064a5c..d993b0ce5 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java @@ -318,6 +318,7 @@ public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcc } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_turbine"; } @@ -367,6 +368,8 @@ public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcc return new Object[] {tanks[0].getFill(), tanks[0].getMaxFill(), tanks[1].getFill(), tanks[1].getMaxFill(), CompatHandler.steamTypeToInt(tanks[0].getTankType())}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getFluid", @@ -376,6 +379,8 @@ public class TileEntityChungus extends TileEntityLoadedBase implements IFluidAcc }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getFluid"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 1bab38cd8..d85dda700 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -275,6 +275,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements IEne // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "dfc_emitter"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java index 20891cbe3..ea5cd0b5b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -197,6 +197,7 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "dfc_injector"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index b2fe65851..4096dc271 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -190,6 +190,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements IEn // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "dfc_receiver"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java index a21677995..bb7e05bbb 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityCoreStabilizer.java @@ -172,6 +172,7 @@ public class TileEntityCoreStabilizer extends TileEntityMachineBase implements I // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "dfc_stabilizer"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java b/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java index 314e91614..4ad991c38 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityGeiger.java @@ -70,6 +70,7 @@ public class TileEntityGeiger extends TileEntity implements SimpleComponent, IIn return rads; } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_geiger"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java index 524671911..4f4c3d65d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityICF.java @@ -295,6 +295,7 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider //OC stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_icf_reactor"; } @@ -345,6 +346,8 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider }; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getHeat", @@ -356,6 +359,8 @@ public class TileEntityICF extends TileEntityMachineBase implements IGUIProvider }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case ("getHeat"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java index 90ac75709..64c6fe31d 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityITER.java @@ -669,6 +669,7 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyRece @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_fusion"; } @@ -724,6 +725,8 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyRece return new Object[] {"N/A", "N/A"}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getEnergyInfo", @@ -736,6 +739,8 @@ public class TileEntityITER extends TileEntityMachineBase implements IEnergyRece }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case ("getEnergyInfo"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java index 81c97679d..6cb9024f0 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineLargeTurbine.java @@ -325,6 +325,7 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_turbine"; } @@ -374,6 +375,8 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme return new Object[] {tanks[0].getFill(), tanks[0].getMaxFill(), tanks[1].getFill(), tanks[1].getMaxFill(), CompatHandler.steamTypeToInt(tanks[0].getTankType())}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getFluid", @@ -383,6 +386,8 @@ public class TileEntityMachineLargeTurbine extends TileEntityMachineBase impleme }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getFluid"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java index 99e87371a..0eb956fe3 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadarNT.java @@ -603,6 +603,7 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I //OC compat! @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_radar"; } @@ -684,6 +685,8 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I return new Object[]{false, e.posX, e.posY, e.posZ, type}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getSettings", @@ -698,6 +701,8 @@ public class TileEntityMachineRadarNT extends TileEntityMachineBase implements I }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getSettings"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java index c216f9da9..ceb1bef2c 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineReactorBreeding.java @@ -217,6 +217,7 @@ public class TileEntityMachineReactorBreeding extends TileEntityMachineBase impl // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "breeding_reactor"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index a5e337448..94cf03e3b 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -340,6 +340,7 @@ public class TileEntityMachineTurbine extends TileEntityLoadedBase implements IS } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_turbine"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java index 71c7266ae..24ad50e60 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbineGas.java @@ -557,6 +557,7 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_gas_turbine"; } @@ -641,6 +642,8 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement tanks[3].getFill(), tanks[3].getMaxFill()}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getFluid", @@ -657,6 +660,8 @@ public class TileEntityMachineTurbineGas extends TileEntityMachineBase implement }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getFluid"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java index b00c2e1d8..b6e4e9d55 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityMicrowave.java @@ -220,6 +220,7 @@ public class TileEntityMicrowave extends TileEntityMachineBase implements IEnerg } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "microwave"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java b/src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java index ac2e162c3..15fe1d786 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java @@ -547,6 +547,7 @@ public class TileEntityPWRController extends TileEntityMachineBase implements IG // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_pwr_control"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java index 51b1229fb..0a5fad22a 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorControl.java @@ -255,6 +255,7 @@ public class TileEntityReactorControl extends TileEntityMachineBase implements I // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "reactor_control"; } diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java index 6eb557ec7..e242b5ee2 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorResearch.java @@ -397,6 +397,7 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "research_reactor"; } @@ -431,6 +432,8 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements return new Object[] {heat, level, targetLevel, totalFlux}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getTemp", @@ -441,6 +444,8 @@ public class TileEntityReactorResearch extends TileEntityMachineBase implements }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getTemp"): diff --git a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java index f753be765..aa989ec85 100644 --- a/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java +++ b/src/main/java/com/hbm/tileentity/machine/TileEntityReactorZirnox.java @@ -548,6 +548,7 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "zirnox_reactor"; } @@ -601,6 +602,8 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF return new Object[] {}; } + @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getTemp", @@ -614,6 +617,8 @@ public class TileEntityReactorZirnox extends TileEntityMachineBase implements IF }; } + @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch(method) { case ("getTemp"): diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java index 3f0beb44b..57bc990bc 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java @@ -338,6 +338,7 @@ public class TileEntityCraneConsole extends TileEntity implements INBTPacketRece // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_crane"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java index 05e4e4e59..ae3ad26ce 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKBoiler.java @@ -345,6 +345,7 @@ public class TileEntityRBMKBoiler extends TileEntityRBMKSlottedBase implements I // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_boiler"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java index b83799464..57211a6cf 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java @@ -521,6 +521,7 @@ public class TileEntityRBMKConsole extends TileEntityMachineBase implements ICon // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_console"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java index b89ed8e36..39ff54514 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControl.java @@ -125,6 +125,7 @@ public abstract class TileEntityRBMKControl extends TileEntityRBMKSlottedBase im // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_control_rod"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java index b457f74d0..f7cba8826 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKCooler.java @@ -147,6 +147,7 @@ public class TileEntityRBMKCooler extends TileEntityRBMKBase implements IFluidAc //do some opencomputers stuff + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_cooler"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java index 440f761d4..302090773 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKHeater.java @@ -279,6 +279,7 @@ public class TileEntityRBMKHeater extends TileEntityRBMKSlottedBase implements I //opencomputers stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_heater"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java index c5a152cc3..d3a6c04f0 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKOutgasser.java @@ -224,6 +224,7 @@ public class TileEntityRBMKOutgasser extends TileEntityRBMKSlottedBase implement //do some opencomputers stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_outgasser"; } diff --git a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java index d1d23badc..f67843023 100644 --- a/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java +++ b/src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKRod.java @@ -393,6 +393,7 @@ public class TileEntityRBMKRod extends TileEntityRBMKSlottedBase implements IRBM // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "rbmk_fuel_rod"; } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java index a02f39e62..4166b5e16 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityBarrel.java @@ -401,6 +401,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_fluid_tank"; } @@ -430,6 +431,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getFluidStored", @@ -440,6 +442,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc } @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case "getFluidStored": diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java index 64ea7037d..99575c496 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineBattery.java @@ -290,6 +290,7 @@ public class TileEntityMachineBattery extends TileEntityMachineBase implements I // do some opencomputer stuff @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_energy_storage"; //ok if someone else can figure out how to do this that'd be nice (change the component name based on the type of storage block) } diff --git a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java index db9014fdb..f78665bb9 100644 --- a/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java +++ b/src/main/java/com/hbm/tileentity/machine/storage/TileEntityMachineFluidTank.java @@ -488,6 +488,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_fluid_tank"; } @@ -517,6 +518,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { return new String[] { "getFluidStored", @@ -526,6 +528,7 @@ public class TileEntityMachineFluidTank extends TileEntityMachineBase implements } @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case "getFluidStored": diff --git a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java index 20d7fe6f6..4c6ab43d8 100644 --- a/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java +++ b/src/main/java/com/hbm/tileentity/network/TileEntityRadioTelex.java @@ -259,6 +259,7 @@ public class TileEntityRadioTelex extends TileEntity implements INBTPacketReceiv } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_telex"; } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java index 7893602c0..156472346 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretArty.java @@ -479,6 +479,7 @@ public class TileEntityTurretArty extends TileEntityTurretBaseArtillery implemen } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { // :vomit: return new String[] { "setActive", @@ -499,6 +500,7 @@ public class TileEntityTurretArty extends TileEntityTurretBaseArtillery implemen } @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case "setActive": diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java index b4e4f1155..9d4152106 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseArtillery.java @@ -76,6 +76,7 @@ public abstract class TileEntityTurretBaseArtillery extends TileEntityTurretBase } @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_artillery"; } diff --git a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java index 419bb807e..bf2594776 100644 --- a/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java +++ b/src/main/java/com/hbm/tileentity/turret/TileEntityTurretBaseNT.java @@ -912,6 +912,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple // This is a large compat, so I have to leave comments to know what I'm doing @Override + @Optional.Method(modid = "OpenComputers") public String getComponentName() { return "ntm_turret"; } @@ -1014,11 +1015,13 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple } @Override + @Optional.Method(modid = "OpenComputers") public boolean canConnectNode(ForgeDirection side) { return side == ForgeDirection.DOWN; } @Override + @Optional.Method(modid = "OpenComputers") public String[] methods() { // :vomit: return new String[] { "setActive", @@ -1036,6 +1039,7 @@ public abstract class TileEntityTurretBaseNT extends TileEntityMachineBase imple } @Override + @Optional.Method(modid = "OpenComputers") public Object[] invoke(String method, Context context, Arguments args) throws Exception { switch (method) { case "setActive": From ee32fff9be78281e6a4c41ac9cbea19a2d55beea Mon Sep 17 00:00:00 2001 From: BallOfEnergy <66693744+BallOfEnergy1@users.noreply.github.com> Date: Tue, 2 Jul 2024 03:20:24 -0500 Subject: [PATCH 3/3] Change default config value 100 -> 200 --- src/main/java/com/hbm/config/GeneralConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/hbm/config/GeneralConfig.java b/src/main/java/com/hbm/config/GeneralConfig.java index bb3a85317..a4a0db045 100644 --- a/src/main/java/com/hbm/config/GeneralConfig.java +++ b/src/main/java/com/hbm/config/GeneralConfig.java @@ -36,7 +36,7 @@ public class GeneralConfig { public static boolean enableSteamParticles = true; public static boolean enableSoundExtension = true; public static boolean enableMekanismChanges = true; - public static int normalSoundChannels = 100; + public static int normalSoundChannels = 200; public static int hintPos = 0; public static boolean enableExpensiveMode = false;