diff --git a/changelog b/changelog index 39319f886..46e6eac40 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,8 @@ * Large deposits (hematite, malachite, bauxite) and caves (sulfur, asbestos) can now be toggled in the config * Removed recipes for most old particle accelerator parts * Dense coils no longer have recipes either for the most part, all coils with no recipes can be recycled back into dense wires +* Natural gas can now be processed in a pyrolysis oven, 12k of gas yields 8k hydrogen and one graphite ingot ## Fixed -* Fixed an issue where `/ntmreload` would load fluids after recipes, meaning that recipes using newly added fluids would not work correctly, as the fluids don't exist by the time the recipe is loaded \ No newline at end of file +* Fixed an issue where `/ntmreload` would load fluids after recipes, meaning that recipes using newly added fluids would not work correctly, as the fluids don't exist by the time the recipe is loaded +* Fixed bedrock coltan being way too common, drowning out almost all other bedrock ores \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java b/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java index 384783d3f..616adb05e 100644 --- a/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PyroOvenRecipes.java @@ -118,6 +118,10 @@ public class PyroOvenRecipes extends SerializableRecipe { recipes.add(new PyroOvenRecipe(60) .in(new FluidStack(GAS_COKER, 4_000)) .out(new FluidStack(Fluids.REFORMGAS, 100))); + //hydrogen and carbon from natgas + recipes.add(new PyroOvenRecipe(60) + .in(new FluidStack(Fluids.GAS, 12_000)) + .out(new FluidStack(Fluids.HYDROGEN, 8_000)).out(new ItemStack(ModItems.ingot_graphite, 1))); } private static void registerSFAuto(FluidType fluid) { diff --git a/src/main/java/com/hbm/lib/HbmWorldGen.java b/src/main/java/com/hbm/lib/HbmWorldGen.java index 42f7e616a..9732970e9 100644 --- a/src/main/java/com/hbm/lib/HbmWorldGen.java +++ b/src/main/java/com/hbm/lib/HbmWorldGen.java @@ -168,7 +168,7 @@ public class HbmWorldGen implements IWorldGenerator { int colZ = (int) (colRand.nextGaussian() * 1500); int colRange = 750; - if((GeneralConfig.enable528BedrockSpawn || GeneralConfig.enable528BedrockDeposit) && rand.nextInt(GeneralConfig.bedrockRate) != 0) { + if((GeneralConfig.enable528BedrockSpawn || GeneralConfig.enable528BedrockDeposit) && rand.nextInt(GeneralConfig.bedrockRate) == 0) { int x = i + rand.nextInt(16) + 8; int z = j + rand.nextInt(16) + 8; @@ -302,14 +302,6 @@ public class HbmWorldGen implements IWorldGenerator { } } - /*if(WorldConfig.siloStructure > 0 && rand.nextInt(WorldConfig.siloStructure) == 0) { - int x = i + rand.nextInt(16); - int z = j + rand.nextInt(16); - int y = world.getHeightValue(x, z); - - new Silo().generate(world, rand, x, y, z); - }*/ - if(WorldConfig.factoryStructure > 0 && rand.nextInt(WorldConfig.factoryStructure) == 0) { int x = i + rand.nextInt(16); int z = j + rand.nextInt(16); diff --git a/src/main/java/com/hbm/uninos/NodeNet.java b/src/main/java/com/hbm/uninos/NodeNet.java index 650d902bd..c40d41a3e 100644 --- a/src/main/java/com/hbm/uninos/NodeNet.java +++ b/src/main/java/com/hbm/uninos/NodeNet.java @@ -68,6 +68,7 @@ public abstract class NodeNet { /// GENERAL POWER NET CONTROL /// public void invalidate() { this.valid = false; UniNodespace.activeNodeNets.remove(this); } public boolean isValid() { return this.valid; } + public void resetTrackers() { } public abstract void update(); public void destroy() { diff --git a/src/main/java/com/hbm/uninos/networks/PowerNetwork.java b/src/main/java/com/hbm/uninos/networks/PowerNetwork.java index 76897c4fc..174f553a9 100644 --- a/src/main/java/com/hbm/uninos/networks/PowerNetwork.java +++ b/src/main/java/com/hbm/uninos/networks/PowerNetwork.java @@ -22,10 +22,6 @@ public class PowerNetwork extends NodeNet { public HashMap providerEntries = new HashMap(); public long energyTracker = 0L; - - public void resetEnergyTracker() { - this.energyTracker = 0; - } @Override // this was all fun and games but let's take a few steps back: this generics stuff is kinda breaking shit, and as it turns out, apparently nothing even uses the type public HashMap, Long> receiverEntries() { @@ -39,6 +35,9 @@ public class PowerNetwork extends NodeNet { protected static int timeout = 3_000; + @Override public void resetTrackers() { this.energyTracker = 0; } + + @Override public void update() { if(providerEntries.isEmpty()) return; diff --git a/src/main/resources/assets/hbm/textures/items/ingot_metal_sheet.png b/src/main/resources/assets/hbm/textures/items/ingot_metal_sheet.png index 94d7d4a40..1490b456c 100644 Binary files a/src/main/resources/assets/hbm/textures/items/ingot_metal_sheet.png and b/src/main/resources/assets/hbm/textures/items/ingot_metal_sheet.png differ diff --git a/src/main/resources/assets/hbm/textures/misc/star_bober_what_is_this_please_reveal_all_secrets_to_me.png b/src/main/resources/assets/hbm/textures/misc/star_bober_what_is_this_please_reveal_all_secrets_to_me.png new file mode 100644 index 000000000..eb6de1f3c Binary files /dev/null and b/src/main/resources/assets/hbm/textures/misc/star_bober_what_is_this_please_reveal_all_secrets_to_me.png differ