Skip to content

Commit

Permalink
god i love huffing gasoline
Browse files Browse the repository at this point in the history
  • Loading branch information
HbmMods committed Mar 31, 2024
1 parent 6f91612 commit 2bb43e5
Show file tree
Hide file tree
Showing 8 changed files with 47 additions and 8 deletions.
6 changes: 6 additions & 0 deletions changelog
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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,\
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/hbm/blocks/ModBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -3180,9 +3180,9 @@ private static void registerBlock() {
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());
Expand Down
12 changes: 11 additions & 1 deletion src/main/java/com/hbm/blocks/machine/rbmk/RBMKInlet.java
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -17,4 +22,9 @@ public RBMKInlet(Material mat) {
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);
}
}
12 changes: 11 additions & 1 deletion src/main/java/com/hbm/blocks/machine/rbmk/RBMKLoader.java
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
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;
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);
Expand All @@ -22,4 +27,9 @@ public boolean canConnect(FluidType type, IBlockAccess world, int x, int y, int
return type.hasTrait(FT_Coolable.class);
}

@Override
public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) {
this.addStandardInfo(stack, player, list, ext);
}

}
12 changes: 11 additions & 1 deletion src/main/java/com/hbm/blocks/machine/rbmk/RBMKOutlet.java
Original file line number Diff line number Diff line change
@@ -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);
Expand All @@ -17,4 +22,9 @@ public RBMKOutlet(Material mat) {
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);
}
}
2 changes: 1 addition & 1 deletion src/main/java/com/hbm/lib/RefStrings.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
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
Expand Down
3 changes: 3 additions & 0 deletions src/main/resources/assets/hbm/lang/en_US.lang
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down

0 comments on commit 2bb43e5

Please sign in to comment.