diff --git a/build.gradle b/build.gradle index d195aa671b..69403bc742 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ apply plugin: 'net.minecraftforge.gradle' apply plugin: 'eclipse' apply plugin: 'maven-publish' -version = '2.0.0' +version = '2.0.1' 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 d038625f56..abb132e467 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ org.gradle.daemon=true org.gradle.configureondemand=true org.gradle.parallel=true version_mc=1.12.2 -version=2.0.0 +version=2.0.1 version_jei=4.16.1.302 version_redstoneflux=2.1.0.6 version_crafttweaker=4.1.14.521 diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index a0f9df8de5..47c5e5d04d 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -465,8 +465,8 @@ public SoundEvent getBreakSound() { public static final Block ore_depth_nether_nitan = new BlockDepthOre("ore_depth_nether_nitan").setCreativeTab(MainRegistry.resourceTab); public static final Block block_meteor = new BlockNTMOre("block_meteor", 3).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); - public static final Block block_meteor_cobble = new BlockNTMOre("block_meteor_cobble", 2).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); - public static final Block block_meteor_broken = new BlockNTMOre("block_meteor_broken", 1).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); + public static final Block block_meteor_cobble = new BlockNTMOre("block_meteor_cobble", 2, 0).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); + public static final Block block_meteor_broken = new BlockNTMOre("block_meteor_broken", 1, 0).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); public static final Block block_meteor_molten = new BlockHazard(Material.ROCK, "block_meteor_molten").addFire(3).toBlock().setTickRandomly(true).setLightLevel(0.75F).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); public static final Block block_meteor_treasure = new BlockNTMOre("block_meteor_treasure", 3).setCreativeTab(MainRegistry.resourceTab).setHardness(15.0F).setResistance(900.0F); public static final Block ore_meteor_uranium = new BlockNTMOre("ore_meteor_uranium", 2, 30).addRadiation(0.25F).toBlock().setCreativeTab(MainRegistry.resourceTab).setHardness(5.0F).setResistance(10.0F); diff --git a/src/main/java/com/hbm/items/food/ItemEnergy.java b/src/main/java/com/hbm/items/food/ItemEnergy.java index 3fba303c8d..98a5fe41c3 100644 --- a/src/main/java/com/hbm/items/food/ItemEnergy.java +++ b/src/main/java/com/hbm/items/food/ItemEnergy.java @@ -289,12 +289,24 @@ public EnumAction getItemUseAction(ItemStack stack) { return EnumAction.DRINK; } + public static boolean hasOpener(EntityPlayer player){ + ItemStack stackR = player.getHeldItemMainhand(); + ItemStack stackL = player.getHeldItemOffhand(); + if(stackR == null || stackL == null) return false; + if(stackR.getItem() == ModItems.bottle_opener || stackL.getItem() == ModItems.bottle_opener){ + return true; + } + return false; + } + @Override public ActionResult onItemRightClick(World worldIn, EntityPlayer player, EnumHand hand) { if(!(this == ModItems.can_creature || this == ModItems.can_mrsugar || this == ModItems.can_overcharge || this == ModItems.can_redbomb || this == ModItems.can_smart || this == ModItems.chocolate_milk || this == ModItems.can_luna || this == ModItems.can_bepis || this == ModItems.can_breen)) - if(!Library.hasInventoryItem(player.inventory, ModItems.bottle_opener)) + + if(!hasOpener(player)) return ActionResult. newResult(EnumActionResult.PASS, player.getHeldItem(hand)); + player.setActiveHand(hand); return ActionResult. newResult(EnumActionResult.SUCCESS, player.getHeldItem(hand)); } diff --git a/src/main/java/com/hbm/lib/RefStrings.java b/src/main/java/com/hbm/lib/RefStrings.java index a577764956..b077213d41 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-2.0.0"; - public static final String CHANGELOG = "§aAdded more Control panel mechanics$§aAdded Conveyors and Extractor/Inserter$§aAdded Torex Nuke$§aAdded Mk5 Nuke processing$§aAdded scortched nuke craters$§aAdded N² and Balefire charge$§aAdded Launchpad cooldown$§aAdded 7 Blockstates per waste block$§aAdded Galacticraft sealing to all big doors$§aAdded 1.7 Fuel system$§aAdded cable gauge$§aAdded peace dimension config$§aAdded hazmat potion resistance$§aAdded pocket radar$§aAdded Bauble support to rad counters$§bChanged RBMK render to be 4x faster but have stretched side texture$§bChanged Nuke and Missile models$§bChanged Batteries to only send to higher tier then themselves$§bChanged Radar and Forcefuel model$§bChanged Xenon-135 production 6x$§cRemoved N45 Mine$§cRemoved Old Drill$§cRemoved bad recipes$§eFixed crash when moving from reloaded$§eFixed Jetpack and hud sync$§eFixed Jungle dungeon spawning$§eFixed Door locking"; + public static final String VERSION = "NTM-Extended-1.12.2-2.0.1"; + public static final String CHANGELOG = "§aAdded Emissive textures$§aAdded contaminated snow and ice$§aAdded chemplant CT support$§aAdded OC support to radsensor/battery$§bChanged Nuke calculations to be faster$§bChanged Fallout to only spawn from nukes$§cRemoved lanthanium from fracturing tower recipe$§eFixed Osmiridium balance$§eFixed translation issues$§eFixed missing textures$§eFixed gas masks$§eFixed server crash$§eFixed IO for RBMK$§eFixed armor on mobs$§eFixed RF crash$§eFixed spinning lights"; //HBM's Beta Naming Convention: //V T (X) //V -> next release version diff --git a/src/main/resources/assets/hbm/textures/blocks/hadron_access_e.png b/src/main/resources/assets/hbm/textures/blocks/hadron_access_e.png new file mode 100644 index 0000000000..6fde4ce585 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/blocks/hadron_access_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_e.png new file mode 100644 index 0000000000..9341e2b1da Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_tiny_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_tiny_e.png new file mode 100644 index 0000000000..e24b319c71 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_counter_tiny_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_e.png new file mode 100644 index 0000000000..1f35d03f65 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_e.png new file mode 100644 index 0000000000..8ffa317ffb Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_tiny_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_tiny_e.png new file mode 100644 index 0000000000..13fe47b25e Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_spark_tiny_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_e.png new file mode 100644 index 0000000000..09b9d69463 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_tiny_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_tiny_e.png new file mode 100644 index 0000000000..c158f83ea2 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_strange_tiny_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_super_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_super_e.png new file mode 100644 index 0000000000..39f49237e1 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_super_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_super_tiny_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_super_tiny_e.png new file mode 100644 index 0000000000..3599842b79 Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_super_tiny_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/capsule_sing_tiny_e.png b/src/main/resources/assets/hbm/textures/items/capsule_sing_tiny_e.png new file mode 100644 index 0000000000..1e36e0ce2d Binary files /dev/null and b/src/main/resources/assets/hbm/textures/items/capsule_sing_tiny_e.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_1.png index 6395bf3cec..2ce92c467a 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_2.png index 60a957235a..da476f9719 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_3.png index f791711268..5c1b21cdc7 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_ejector_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_ejector_3.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_stack_1.png b/src/main/resources/assets/hbm/textures/items/upgrade_stack_1.png index a478d4b053..b650828dc9 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_stack_1.png and b/src/main/resources/assets/hbm/textures/items/upgrade_stack_1.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_stack_2.png b/src/main/resources/assets/hbm/textures/items/upgrade_stack_2.png index b2bcf0eeb3..f016d17e9d 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_stack_2.png and b/src/main/resources/assets/hbm/textures/items/upgrade_stack_2.png differ diff --git a/src/main/resources/assets/hbm/textures/items/upgrade_stack_3.png b/src/main/resources/assets/hbm/textures/items/upgrade_stack_3.png index 705d1dbded..42832bf0d6 100644 Binary files a/src/main/resources/assets/hbm/textures/items/upgrade_stack_3.png and b/src/main/resources/assets/hbm/textures/items/upgrade_stack_3.png differ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index c9474a9bb5..2dc2cf25c5 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "hbm", "name": "HBM's Nuclear Tech - Extended Edition", "description": "A mod that adds all kinds of nukes and other things", - "version": "2.0.0", + "version": "2.0.1", "credits": "\n\nHBMMods: creator\nDrillgon200: original 1.12.2 port\nTheOriginalGolem: 1.12.2 bug fixing\nAlcater: Custom 1.12.2 version, updating and texturing\n\nSten89: bug tester\nGB_Doge_9000: bug tester\nHoboy: textures and models\nDoctor17: Russian translations\ngrangerave\nrodolphito\nmexikoedi: log spam fix\nCrowbar Collective: gluon gun sounds\n70000HP: MIRV and configs\n", "logoFile": "assets/hbm/textures/logo.png", "mcversion": "${mcversion}",