diff --git a/changelog b/changelog index 12a0a3ec7..db178b44d 100644 --- a/changelog +++ b/changelog @@ -10,6 +10,7 @@ * Removed generator bodies and rotors, recipes use 6 dense gold wires per generator instead * Removed reinforced turbine shafts, most turbines now use HSS pipes instead * Removed the steam batteries (why did we even have those?) +* Removed some old remap items (from back when the ZIRNOX rods got remapped) * Large and small shells have been merged into a single item which uses material autogen * A copper variant for shells has been added which is used for artillery shells * Shells are now only directly craftable via anvil, however they can be cast using the crucible as well @@ -19,8 +20,13 @@ * Tenfolded the throughout of powered condensers * Regular and combo filters now work for blistering agents (like mustard gas or air pollution) * Wires now render two faces instead of one, making them appear equally thick from any viewed angle +* Slag taps can now be toggled and filtered +* Foundry channels now have twice the throughput (2 ingots) +* RBMK ReaSim and steam connectors now have tooltips explaining how they work, as there is no other ingame documentation on them ## Fixed * Fixed crash caused by invalid default loot pool configuration * Fixed enchantment glint not rendering on upscaled items like certain swords or tier 2 pickaxes * Fixed wire connections becoming invisible when pointing straight down, wires should now rotate correctly +* Fixed connection issue allowing channels to output into slag taps sideways +* Fixed the strand caster sometimes voiding small amounts of material diff --git a/gradle.properties b/gradle.properties index 1c7eda94d..305737cdc 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ mod_version=1.0.27 # Empty build number makes a release type -mod_build_number=4915 +mod_build_number=4921 credits=HbMinecraft, rodolphito (explosion algorithms), grangerave (explosion algorithms),\ \ Hoboy (textures, models), Doctor17 (russian localization), Drillgon200 (effects, models,\ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 40edfda99..bbd2bff36 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -3180,9 +3180,9 @@ public class ModBlocks { GameRegistry.registerBlock(rbmk_heater, rbmk_heater.getUnlocalizedName()); GameRegistry.registerBlock(rbmk_console, rbmk_console.getUnlocalizedName()); GameRegistry.registerBlock(rbmk_crane_console, rbmk_crane_console.getUnlocalizedName()); - GameRegistry.registerBlock(rbmk_loader, rbmk_loader.getUnlocalizedName()); - GameRegistry.registerBlock(rbmk_steam_inlet, rbmk_steam_inlet.getUnlocalizedName()); - GameRegistry.registerBlock(rbmk_steam_outlet, rbmk_steam_outlet.getUnlocalizedName()); + register(rbmk_loader); + register(rbmk_steam_inlet); + register(rbmk_steam_outlet); GameRegistry.registerBlock(rbmk_heatex, rbmk_heatex.getUnlocalizedName()); GameRegistry.registerBlock(pribris, pribris.getUnlocalizedName()); GameRegistry.registerBlock(pribris_burning, pribris_burning.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java index 7fbc50e7d..87127a718 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java @@ -1,13 +1,18 @@ package com.hbm.blocks.machine.rbmk; +import java.util.List; + +import com.hbm.blocks.ITooltipProvider; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKInlet; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class RBMKInlet extends BlockContainer { +public class RBMKInlet extends BlockContainer implements ITooltipProvider { public RBMKInlet(Material mat) { super(mat); @@ -17,4 +22,9 @@ public class RBMKInlet extends BlockContainer { public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityRBMKInlet(); } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + this.addStandardInfo(stack, player, list, ext); + } } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKLoader.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKLoader.java index 52955a187..da2c58002 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKLoader.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKLoader.java @@ -1,5 +1,8 @@ package com.hbm.blocks.machine.rbmk; +import java.util.List; + +import com.hbm.blocks.ITooltipProvider; import com.hbm.blocks.generic.BlockGeneric; import com.hbm.inventory.fluid.FluidType; import com.hbm.inventory.fluid.trait.FT_Coolable; @@ -7,10 +10,12 @@ import com.hbm.inventory.fluid.trait.FT_Heatable; import api.hbm.fluid.IFluidConnectorBlock; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.world.IBlockAccess; import net.minecraftforge.common.util.ForgeDirection; -public class RBMKLoader extends BlockGeneric implements IFluidConnectorBlock { +public class RBMKLoader extends BlockGeneric implements IFluidConnectorBlock, ITooltipProvider { public RBMKLoader(Material material) { super(material); @@ -22,4 +27,9 @@ public class RBMKLoader extends BlockGeneric implements IFluidConnectorBlock { return type.hasTrait(FT_Coolable.class); } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + this.addStandardInfo(stack, player, list, ext); + } + } diff --git a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java index 9a30ea035..6772322f2 100644 --- a/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java +++ b/src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java @@ -1,13 +1,18 @@ package com.hbm.blocks.machine.rbmk; +import java.util.List; + +import com.hbm.blocks.ITooltipProvider; import com.hbm.tileentity.machine.rbmk.TileEntityRBMKOutlet; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -public class RBMKOutlet extends BlockContainer { +public class RBMKOutlet extends BlockContainer implements ITooltipProvider { public RBMKOutlet(Material mat) { super(mat); @@ -17,4 +22,9 @@ public class RBMKOutlet extends BlockContainer { public TileEntity createNewTileEntity(World world, int meta) { return new TileEntityRBMKOutlet(); } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + this.addStandardInfo(stack, player, list, ext); + } } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 40677cd5e..d4ba6dc9a 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,7 +3,7 @@ package com.hbm.lib; public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech Mod"; - public static final String VERSION = "1.0.27 BETA (4915)"; + public static final String VERSION = "1.0.27 BETA (4921)"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 6e1b02c44..7d74c5a94 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -5510,6 +5510,7 @@ tile.rbmk_crane_console.name=RBMK Crane Console tile.rbmk_heater.name=RBMK Fluid Heater tile.rbmk_heatex.name=RBMK Heat Exchanger tile.rbmk_loader.name=RBMK Steam Connector +tile.rbmk_loader.desc=Allows RBMKs to have both water and steam connections at the bottom$Place one water pipe below the RBMK column, then the connector,$then connect the steam duct to the connector. tile.rbmk_moderator.name=RBMK Graphite Moderator tile.rbmk_outgasser.name=RBMK Irradiation Channel tile.rbmk_reflector.name=RBMK Tungsten Carbide Neutron Reflector @@ -5518,7 +5519,9 @@ tile.rbmk_rod_mod.name=RBMK Moderated Fuel Rod tile.rbmk_rod_reasim.name=RBMK Fuel Rod (ReaSim) tile.rbmk_rod_reasim_mod.name=RBMK Moderated Fuel Rod (ReaSim) tile.rbmk_steam_inlet.name=RBMK ReaSim Water Inlet +tile.rbmk_steam_inlet.desc=Inserts water into RBMK columns if ReaSim boilers are enabled$Connects to RBMK columns sideways tile.rbmk_steam_outlet.name=RBMK ReaSim Steam Outlet +tile.rbmk_steam_outlet.desc=Extracts super dense steam from RBMK columns if ReaSim boilers are enabled$Connects to RBMK columns sideways tile.rbmk_storage.name=RBMK Storage Column tile.reactor_computer.name=Reactor Control tile.reactor_conductor.name=Reactor Boiler