diff --git a/build.gradle b/build.gradle index 18810e37ea..f83bd21f44 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '1.9.4-a' +version = '1.9.5-II' group = 'com.hbm' // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = 'NTM-Extended-1.12.2' diff --git a/gradle.properties b/gradle.properties index 5396fcb00e..3fdd0a44c3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,10 +1,10 @@ # 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=-Xmx8G +org.gradle.jvmargs=-Xmx2G org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true version_mc=1.12.2 -version=1.9.4-a +version=1.9.5-II version_jei=4.16.1.302 version_crafttweaker=4.1.14.521 diff --git a/src/main/java/com/hbm/blocks/machine/StorageDrum.java b/src/main/java/com/hbm/blocks/machine/StorageDrum.java index 5652b8b139..38a1b33742 100644 --- a/src/main/java/com/hbm/blocks/machine/StorageDrum.java +++ b/src/main/java/com/hbm/blocks/machine/StorageDrum.java @@ -1,17 +1,22 @@ package com.hbm.blocks.machine; +import java.util.List; + +import com.hbm.blocks.ITooltipProvider; import com.hbm.tileentity.machine.TileEntityStorageDrum; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; import net.minecraft.tileentity.TileEntity; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; import net.minecraft.util.EnumBlockRenderType; import net.minecraft.util.math.AxisAlignedBB; import net.minecraft.util.math.BlockPos; import net.minecraft.world.IBlockAccess; import net.minecraft.world.World; -public class StorageDrum extends BlockMachineBase { +public class StorageDrum extends BlockMachineBase implements ITooltipProvider { public StorageDrum(Material mat, int guiID, String s) { super(mat, guiID, s); @@ -64,4 +69,9 @@ public AxisAlignedBB getBoundingBox(IBlockState state, IBlockAccess source, Bloc return new AxisAlignedBB(2 * f, 0.0F, 2 * f, 14 * f, 1.0F, 14 * f); } + @Override + public void addInformation(ItemStack stack, World worldIn, List list, ITooltipFlag flagIn) { + this.addStandardInfo(list); + super.addInformation(stack, worldIn, list, flagIn); + } } \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/machine/WasteDrum.java b/src/main/java/com/hbm/blocks/machine/WasteDrum.java index befd0481fa..4cbc5f3d70 100644 --- a/src/main/java/com/hbm/blocks/machine/WasteDrum.java +++ b/src/main/java/com/hbm/blocks/machine/WasteDrum.java @@ -1,14 +1,19 @@ package com.hbm.blocks.machine; +import java.util.List; + import com.hbm.blocks.ModBlocks; import com.hbm.lib.InventoryHelper; import com.hbm.main.MainRegistry; +import com.hbm.blocks.ITooltipProvider; import com.hbm.tileentity.machine.TileEntityWasteDrum; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.block.state.IBlockState; +import net.minecraft.client.util.ITooltipFlag; +import net.minecraft.item.ItemStack; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.EnumBlockRenderType; @@ -17,7 +22,7 @@ import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -public class WasteDrum extends BlockContainer { +public class WasteDrum extends BlockContainer implements ITooltipProvider { public WasteDrum(Material materialIn, String s) { super(materialIn); @@ -67,4 +72,9 @@ public EnumBlockRenderType getRenderType(IBlockState state) { return EnumBlockRenderType.MODEL; } + @Override + public void addInformation(ItemStack stack, World worldIn, List list, ITooltipFlag flagIn) { + this.addStandardInfo(list); + super.addInformation(stack, worldIn, list, flagIn); + } } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index 4c9207ffbf..dde122ba90 100644 --- a/src/main/java/com/hbm/lib/RefStrings.java +++ b/src/main/java/com/hbm/lib/RefStrings.java @@ -3,8 +3,8 @@ public class RefStrings { public static final String MODID = "hbm"; public static final String NAME = "Hbm's Nuclear Tech - Extended Edition"; - public static final String VERSION = "NTM-Extended-1.12.2-1.9.5-I"; - public static final String CHANGELOG = "$§dUpdated the entire energy system$$§aAdded Big Electrical Pylon$§aAdded Substation$§aAdded Power Diode$§aAdded Redstone Power Switch$§aAdded Heat Boiler$§aAdded Glowing Ones mob$§aAdded S.A.F.E. Singularity Breeding$§aAdded tiny singularities$§aAdded Gas Mask System$§aAdded Asbestos and Coal Config toggle$§aAdded Gerald Mining Ship$§aAdded IV_Bags, Desh Gear$§aAdded Zombie Horse rad conversion$§aAdded RBMK Console Redstone Control$$§bChanged the radiation engine to use any radioactive thing$§bChanged cable and pipe textures and models$§bChanged the turbofan$$§eFixed Gas Block Crash$§eFixed armor movement$§eFixed Graphite Crafting$§eFixed RBMK Fuel Rod Xenon Burn Function Spelling$§eFixed RBMK Smooth Deco spelling$§eFixed BlastDoor$§eFixed RBMK Water GUI$§eFixed Rad-X not working$§eFixed Big Reactor Leak$§eFixed Frozen Log Texture$§eFixed Villagar zombification$§eFixed 15 different bugs"; + public static final String VERSION = "NTM-Extended-1.12.2-1.9.5-II"; + public static final String CHANGELOG = "§aAdded Forge Energy support to power converters$§aAdded JEI support to Transmutation and Nuclear Waste Storage Drum$§aAdded pages to RBMK Guide$§aAdded look overlay to batteries$§aAdded gas mask no-filter rendering$§aAdded Crystal schraranium recipe$§aAdded missing hen silex recipes$§aAdded RBMK Guide recipe$$§bChanged RBMK Neg-Quad functions$§bChanged RBMK fuel function display$§bChanged Meteor Dungeon spawn height from 10 to 12$$§eFixed Explosion crash$§eFixed fluid pipe rendering crash$§eFixed Particle Lag for Factories$§eFixed DiFurnace recipes$§eFixed Gas mask tooltip crash$§eFixed Zombie hazmat equip$§eFixed Advancement triggering$§eFixed Solid cable and duct fps lag"; //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 20123f7830..4929cdb21b 100644 --- a/src/main/resources/assets/hbm/lang/en_us.lang +++ b/src/main/resources/assets/hbm/lang/en_us.lang @@ -1701,6 +1701,7 @@ tile.machine_rtg_blue.name=Convection Generator tile.machine_rtg_purple.name=Antimatter Annihilation Generator tile.machine_waste_drum.name=Spent Fuel Pool Drum +tile.machine_waste_drum.desc=Needs water on at least one side. The more sides have water the faster it is. container.wasteDrum=Spent Fuel Pool Drum tile.machine_spp_bottom.name=ZPE Potential Generator (Bottom) @@ -4396,6 +4397,7 @@ tile.block_lanthanium.name=Block of Lanthanium tile.ore_cinnebar.name=Cinnabar Ore tile.block_actinium.name=Block of Actinium tile.machine_storage_drum.name=Nuclear Waste Disposal Drum +tile.machine_storage_drum.desc=Contents slowly decay with time. If the internal liquid and gaseous waste tanks are full then radiation will leak. tile.machine_condenser.name=Steam Condenser tile.machine_orbus.name=Heavy Magnetic Storage Tank tile.fraction_spacer.name=Fractioning Tower Separator diff --git a/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png index 3e56884289..86ab15423d 100644 Binary files a/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png and b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png.mcmeta b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png.mcmeta new file mode 100644 index 0000000000..4f2bd2afe5 --- /dev/null +++ b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid.png.mcmeta @@ -0,0 +1,9 @@ +{ + "ctm": { + "ctm_version": 1, + "type": "CTM", + "textures": [ + "hbm:blocks/fluid_duct_solid_ctm" + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid_ctm.png b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid_ctm.png new file mode 100644 index 0000000000..4671853341 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/fluid_duct_solid_ctm.png differ