diff --git a/changelog b/changelog index aea9ce396..a52ef30e0 100644 --- a/changelog +++ b/changelog @@ -1,38 +1,6 @@ -## Added -* Key pad - * Fits visually with the RBMK display block - * Allows up to four buttons to be configured with a screwdriver (shift click!) - * Buttons will send RoR signals when pressed, with a configured value on the configured frequencies - * Can be set to polling, which will re-send the command until the button is pressed again - * Single push buttons and buttons set to polling which are enabled will glow in the dark - * Each button can be assigned a label with glow in the dark paint - * Allows RBMK control rods to be fully remote controllable with no console -* Gauge - * Allows up to four gauges to be configured with a screwdriver - * Gauges can read RoR signals and display numeric values on a specified range - * Minimum and maximum values can be defined, the gauge also has a red area for when the value exceeds the maximum - * If the minimum value is larger than the maximum, the needle will start at the top and run backwards - * Also has glow in the dark paint labels - ## Changed -* Updated chinese and ukrainian localization -* Updated textures for some nuclear bomb GUIs -* Updated textures for steel tools -* RBMK fuel rods too hot to be taken out manually can now be removed by players in creative mode -* Updated the SILEX recycling recipe for MOX fuel to reflect the recent recipe change - * High-xenon MOX pellets now yield xenon-135 again -* Improved logging for incorrectly configured machine recipes -* Removed the legacy toolbox item -* Due to complaints, the MOX recipe was now made more expensive -* Manual control rods now have the `extendrods` command, which allows the target setting to be adjusted without using an absolute value -* Removed the legacy relay structure -* Placing RBMK fuel rods in the fuel channels by right click no longer consumes the item in creative mode +* Doubled bismuth and tantalum yields from high-performance solvent bedrock ore processing +* Hoppers and buckets can now be made out of steel ## Fixed -* Fixed some damage categories not applying correctly, causing things like general energy resistance to not work against lasers -* Fixed RoR components not being able to be attached to the top of reasim fuel rods -* Fixed a crash in multiplayer regarding RBMK control rods -* Fixed outdated QMAW description of some RBMK parts -* Fixed log spam when placing down a RoR controller -* Fixed the RBMK fuel crane being all jittery and awful -* Fixed RoR reader sending the xenon value on RBMK fuel rods that's 100x the intended value +* Fixed size 15 dual kerosene thruster not rendering at all \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 38cac7b77..8703cb9cc 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -15,6 +15,7 @@ import com.hbm.blocks.machine.fusion.MachineFusionCoupler; import com.hbm.blocks.machine.fusion.MachineFusionKlystron; import com.hbm.blocks.machine.fusion.MachineFusionKlystronCreative; import com.hbm.blocks.machine.fusion.MachineFusionMHDT; +import com.hbm.blocks.machine.fusion.MachineFusionPlasmaForge; import com.hbm.blocks.machine.fusion.MachineFusionTorus; import com.hbm.blocks.machine.pile.*; import com.hbm.blocks.machine.rbmk.*; @@ -887,6 +888,7 @@ public class ModBlocks { public static Block fusion_boiler; public static Block fusion_mhdt; public static Block fusion_coupler; + public static Block fusion_plasma_forge; public static Block machine_icf_press; public static Block icf_component; @@ -2003,6 +2005,7 @@ public class ModBlocks { fusion_boiler = new MachineFusionBoiler().setBlockName("fusion_boiler").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); fusion_mhdt = new MachineFusionMHDT().setBlockName("fusion_mhdt").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); fusion_coupler = new MachineFusionCoupler().setBlockName("fusion_coupler").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); + fusion_plasma_forge = new MachineFusionPlasmaForge().setBlockName("fusion_plasma_forge").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); machine_icf_press = new MachineICFPress().setBlockName("machine_icf_press").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); icf = new MachineICF().setBlockName("icf").setHardness(5.0F).setResistance(60.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_steel"); @@ -3364,6 +3367,7 @@ public class ModBlocks { register(fusion_boiler); register(fusion_mhdt); register(fusion_coupler); + register(fusion_plasma_forge); register(watz_element); register(watz_cooler); diff --git a/src/main/java/com/hbm/blocks/machine/fusion/MachineFusionPlasmaForge.java b/src/main/java/com/hbm/blocks/machine/fusion/MachineFusionPlasmaForge.java new file mode 100644 index 000000000..02158d812 --- /dev/null +++ b/src/main/java/com/hbm/blocks/machine/fusion/MachineFusionPlasmaForge.java @@ -0,0 +1,31 @@ +package com.hbm.blocks.machine.fusion; + +import com.hbm.blocks.BlockDummyable; +import com.hbm.tileentity.machine.fusion.TileEntityFusionPlasmaForge; + +import net.minecraft.block.material.Material; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +public class MachineFusionPlasmaForge extends BlockDummyable { + + public MachineFusionPlasmaForge() { + super(Material.iron); + } + + @Override + public TileEntity createNewTileEntity(World world, int meta) { + if(meta >= 12) return new TileEntityFusionPlasmaForge(); + return null; + } + + @Override + public int[] getDimensions() { + return new int[] { 4, 0, 5, 5, 5, 5 }; + } + + @Override + public int getOffset() { + return 5; + } +} diff --git a/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipe.java b/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipe.java index 27f92cb14..145ed89ab 100644 --- a/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipe.java +++ b/src/main/java/com/hbm/inventory/recipes/loader/GenericRecipe.java @@ -82,7 +82,6 @@ public class GenericRecipe { public GenericRecipe outputFluids(FluidStack... output) { this.outputFluid = output; return this; } private void checkStackLimit(AStack stack) { - boolean exceeds = false; int max = 64; if(stack instanceof ComparableStack) { ComparableStack comp = (ComparableStack) stack; diff --git a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java index ef67a0bff..ac45fb167 100644 --- a/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java +++ b/src/main/java/com/hbm/items/special/ItemBedrockOreNew.java @@ -130,7 +130,7 @@ public class ItemBedrockOreNew extends Item { public static enum BedrockOreType { // primary sulfuric solvent radsolvent LIGHT_METAL( 0xFFFFFF, 0x353535, "light", o(MAT_IRON, 9), o(MAT_COPPER, 9), o(MAT_TITANIUM, 6), o(MAT_BAUXITE, 9), o(MAT_CRYOLITE, 3), o(MAT_CHLOROCALCITE, 5), o(MAT_LITHIUM, 5), o(MAT_SODIUM, 3), o(MAT_CHLOROCALCITE, 6), o(MAT_LITHIUM, 6), o(MAT_SODIUM, 6)), - HEAVY_METAL( 0x868686, 0x000000, "heavy", o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 2), o(MAT_GOLD, 2), o(MAT_BERYLLIUM, 3), o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 5), o(MAT_BISMUTH, 1), o(MAT_TANTALIUM, 1), o(MAT_GOLD, 6)), + HEAVY_METAL( 0x868686, 0x000000, "heavy", o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 2), o(MAT_GOLD, 2), o(MAT_BERYLLIUM, 3), o(MAT_TUNGSTEN, 9), o(MAT_LEAD, 9), o(MAT_GOLD, 5), o(MAT_BISMUTH, 2), o(MAT_TANTALIUM, 2), o(MAT_GOLD, 6)), RARE_EARTH( 0xE6E6B6, 0x1C1C00, "rare", o(MAT_COBALT, 5), o(MAT_RAREEARTH, 5),o(MAT_BORON, 5), o(MAT_LANTHANIUM, 3), o(MAT_NIOBIUM, 4), o(MAT_NEODYMIUM, 3), o(MAT_STRONTIUM, 3), o(MAT_ZIRCONIUM, 3), o(MAT_NIOBIUM, 5), o(MAT_NEODYMIUM, 5), o(MAT_STRONTIUM, 3)), ACTINIDE( 0xC1C7BD, 0x2B3227, "actinide", o(MAT_URANIUM, 4), o(MAT_THORIUM, 4), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_RADIUM, 2), o(MAT_RADIUM, 2), o(MAT_POLONIUM, 2), o(MAT_TECHNETIUM, 1), o(MAT_TECHNETIUM, 1), o(MAT_U238, 1)), NON_METAL( 0xAFAFAF, 0x0F0F0F, "nonmetal", o(MAT_COAL, 9), o(MAT_SULFUR, 9), o(MAT_LIGNITE, 9), o(MAT_KNO, 6), o(MAT_FLUORITE, 6), o(MAT_PHOSPHORUS, 5), o(MAT_FLUORITE, 6), o(MAT_SULFUR, 6), o(MAT_CHLOROCALCITE, 6), o(MAT_SILICON, 2), o(MAT_SILICON, 2)), diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index c07020291..374b28ba8 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -431,6 +431,7 @@ public class ClientProxy extends ServerProxy { ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFusionBoiler.class, new RenderFusionBoiler()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFusionMHDT.class, new RenderFusionMHDT()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFusionCoupler.class, new RenderFusionCoupler()); + ClientRegistry.bindTileEntitySpecialRenderer(TileEntityFusionPlasmaForge.class, new RenderFusionPlasmaForge()); //Watz ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatz.class, new RenderWatz()); ClientRegistry.bindTileEntitySpecialRenderer(TileEntityWatzPump.class, new RenderWatzPump()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 90ab0e3a9..ec8a8a774 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -293,6 +293,8 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModBlocks.machine_autocrafter, 1), new Object[] { "SCS", "MWM", "SCS", 'S', STEEL.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'M', ModItems.motor, 'W', Blocks.crafting_table }); addRecipeAuto(new ItemStack(ModBlocks.machine_funnel, 1), new Object[] { "S S", "SRS", " S ", 'S', STEEL.ingot(), 'R', REDSTONE.dust() }); + addRecipeAuto(new ItemStack(Blocks.hopper, 1), new Object[] { "S S", "S S", " S ", 'S', STEEL.ingot() }); + addRecipeAuto(new ItemStack(Items.bucket, 1), new Object[] { "S S", " S ", 'S', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.machine_waste_drum, 1), new Object[] { "LRL", "BRB", "LRL", 'L', PB.ingot(), 'B', Blocks.iron_bars, 'R', ModItems.rod_quad_empty }); addRecipeAuto(new ItemStack(ModBlocks.machine_press, 1), new Object[] { "IRI", "IPI", "IBI", 'I', IRON.ingot(), 'R', Blocks.furnace, 'B', IRON.block(), 'P', Blocks.piston }); addRecipeAuto(new ItemStack(ModBlocks.machine_ammo_press, 1), new Object[] { "IPI", "C C", "SSS", 'I', IRON.ingot(), 'P', Blocks.piston, 'C', CU.ingot(), 'S', Blocks.stone }); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 89c233042..2391413a4 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -249,6 +249,7 @@ public class ResourceManager { public static final IModelCustom fusion_boiler = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/fusion/boiler.obj")).asVBO(); public static final IModelCustom fusion_mhdt = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/fusion/mhdt.obj")).asVBO(); public static final IModelCustom fusion_coupler = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/fusion/coupler.obj")).asVBO(); + public static final IModelCustom fusion_plasma_forge = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/fusion/plasma_forge.obj")).asVBO(); //ICF public static final IModelCustom icf = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/reactors/icf.obj")).asVBO(); @@ -723,6 +724,7 @@ public class ResourceManager { public static final ResourceLocation fusion_boiler_tex = new ResourceLocation(RefStrings.MODID, "textures/models/fusion/boiler.png"); public static final ResourceLocation fusion_mhdt_tex = new ResourceLocation(RefStrings.MODID, "textures/models/fusion/mhdt.png"); public static final ResourceLocation fusion_coupler_tex = new ResourceLocation(RefStrings.MODID, "textures/models/fusion/coupler.png"); + public static final ResourceLocation fusion_plasma_forge_tex = new ResourceLocation(RefStrings.MODID, "textures/models/fusion/plasma_forge.png"); //ICF public static final ResourceLocation icf_tex = new ResourceLocation(RefStrings.MODID, "textures/models/machines/icf.png"); diff --git a/src/main/java/com/hbm/render/tileentity/RenderFusionPlasmaForge.java b/src/main/java/com/hbm/render/tileentity/RenderFusionPlasmaForge.java new file mode 100644 index 000000000..070c2df85 --- /dev/null +++ b/src/main/java/com/hbm/render/tileentity/RenderFusionPlasmaForge.java @@ -0,0 +1,128 @@ +package com.hbm.render.tileentity; + +import org.lwjgl.opengl.GL11; + +import com.hbm.blocks.BlockDummyable; +import com.hbm.blocks.ModBlocks; +import com.hbm.main.ResourceManager; +import com.hbm.render.item.ItemRenderBase; + +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.item.Item; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.client.IItemRenderer; + +public class RenderFusionPlasmaForge extends TileEntitySpecialRenderer implements IItemRendererProvider { + + @Override + public void renderTileEntityAt(TileEntity tile, double x, double y, double z, float interp) { + GL11.glPushMatrix(); + GL11.glTranslated(x + 0.5, y, z + 0.5); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_CULL_FACE); + + GL11.glRotatef(90, 0F, 1F, 0F); + + switch(tile.getBlockMetadata() - BlockDummyable.offset) { + case 2: GL11.glRotatef(90, 0F, 1F, 0F); break; + case 4: GL11.glRotatef(180, 0F, 1F, 0F); break; + case 3: GL11.glRotatef(270, 0F, 1F, 0F); break; + case 5: GL11.glRotatef(0, 0F, 1F, 0F); break; + } + + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.fusion_plasma_forge_tex); + ResourceManager.fusion_plasma_forge.renderPart("Body"); + + GL11.glPushMatrix(); + GL11.glRotated(20, 0, 1, 0); + GL11.glPushMatrix(); + ResourceManager.fusion_plasma_forge.renderPart("SliderStriker"); + GL11.glTranslated(-2.75, 2.5, 0); + GL11.glRotated(-20, 0, 0, 1); + GL11.glTranslated(2.75, -2.5, 0); + ResourceManager.fusion_plasma_forge.renderPart("ArmLowerStriker"); + GL11.glTranslated(-2.75, 3.75, 0); + GL11.glRotated(30, 0, 0, 1); + GL11.glTranslated(2.75, -3.75, 0); + ResourceManager.fusion_plasma_forge.renderPart("ArmUpperStriker"); + GL11.glTranslated(-1.5, 3.75, 0); + GL11.glRotated(20, 0, 0, 1); + GL11.glTranslated(1.5, -3.75, 0); + ResourceManager.fusion_plasma_forge.renderPart("StrikerMount"); + GL11.glPushMatrix(); + GL11.glTranslated(0, 3.375, 0.5); + GL11.glRotated(30, 1, 0, 0); + GL11.glTranslated(0, -3.375, -0.5); + ResourceManager.fusion_plasma_forge.renderPart("StrikerRight"); + GL11.glTranslated(0, -0.5, 0); + ResourceManager.fusion_plasma_forge.renderPart("PistonRight"); + GL11.glPopMatrix(); + GL11.glPushMatrix(); + GL11.glTranslated(0, 3.375, -0.5); + GL11.glRotated(-30, 1, 0, 0); + GL11.glTranslated(0, -3.375, 0.5); + ResourceManager.fusion_plasma_forge.renderPart("StrikerLeft"); + GL11.glTranslated(0, -0.5, 0); + ResourceManager.fusion_plasma_forge.renderPart("PistonLeft"); + GL11.glPopMatrix(); + GL11.glPopMatrix(); + + GL11.glPushMatrix(); + ResourceManager.fusion_plasma_forge.renderPart("SliderJet"); + GL11.glTranslated(2.75, 2.5, 0); + GL11.glRotated(20, 0, 0, 1); + GL11.glTranslated(-2.75, -2.5, 0); + ResourceManager.fusion_plasma_forge.renderPart("ArmLowerJet"); + GL11.glTranslated(2.75, 3.75, 0); + GL11.glRotated(-20, 0, 0, 1); + GL11.glTranslated(-2.75, -3.75, 0); + ResourceManager.fusion_plasma_forge.renderPart("ArmUpperJet"); + GL11.glTranslated(1.5, 3.75, 0); + GL11.glRotated(-30, 0, 0, 1); + GL11.glTranslated(-1.5, -3.75, 0); + ResourceManager.fusion_plasma_forge.renderPart("Jet"); + GL11.glPopMatrix(); + GL11.glPopMatrix(); + + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor3f(0F, 0F, 0F); + ResourceManager.fusion_plasma_forge.renderPart("Plasma"); + GL11.glColor3f(1F, 1F, 1F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + + GL11.glShadeModel(GL11.GL_FLAT); + + GL11.glPopMatrix(); + } + + @Override + public Item getItemForRenderer() { + return Item.getItemFromBlock(ModBlocks.fusion_plasma_forge); + } + + @Override + public IItemRenderer getRenderer() { + return new ItemRenderBase() { + public void renderInventory() { + GL11.glTranslated(0, -1, 0); + GL11.glScaled(2.75, 2.75, 2.75); + GL11.glRotated(90, 0, 1, 0); + } + public void renderCommon() { + GL11.glScaled(0.5, 0.5, 0.5); + GL11.glRotatef(90, 0F, 1F, 0F); + GL11.glShadeModel(GL11.GL_SMOOTH); + bindTexture(ResourceManager.fusion_plasma_forge_tex); + ResourceManager.fusion_plasma_forge.renderAllExcept("Plasma"); + + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glColor3f(0F, 0F, 0F); + ResourceManager.fusion_plasma_forge.renderPart("Plasma"); + GL11.glColor3f(1F, 1F, 1F); + GL11.glEnable(GL11.GL_TEXTURE_2D); + + GL11.glShadeModel(GL11.GL_FLAT); + }}; + } +} diff --git a/src/main/java/com/hbm/render/util/MissilePart.java b/src/main/java/com/hbm/render/util/MissilePart.java index 1f33a4b6a..74b3ff60c 100644 --- a/src/main/java/com/hbm/render/util/MissilePart.java +++ b/src/main/java/com/hbm/render/util/MissilePart.java @@ -38,6 +38,7 @@ public class MissilePart { MissilePart.registerPart(ModItems.mp_thruster_10_xenon, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_10_xenon, ResourceManager.mp_t_10_xenon_tex); // MissilePart.registerPart(ModItems.mp_thruster_15_kerosene, PartType.THRUSTER, 1.5, 1.5, ResourceManager.mp_t_15_kerosene, ResourceManager.mp_t_15_kerosene_tex); + MissilePart.registerPart(ModItems.mp_thruster_15_kerosene_dual, PartType.THRUSTER, 1, 1.5, ResourceManager.mp_t_15_kerosene_dual, ResourceManager.mp_t_15_kerosene_dual_tex); MissilePart.registerPart(ModItems.mp_thruster_15_kerosene_triple, PartType.THRUSTER, 1, 1.5, ResourceManager.mp_t_15_kerosene_triple, ResourceManager.mp_t_15_kerosene_dual_tex); MissilePart.registerPart(ModItems.mp_thruster_15_solid, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_15_solid, ResourceManager.mp_t_15_solid_tex); MissilePart.registerPart(ModItems.mp_thruster_15_solid_hexdecuple, PartType.THRUSTER, 0.5, 1, ResourceManager.mp_t_15_solid_hexdecuple, ResourceManager.mp_t_15_solid_hexdecuple_tex); diff --git a/src/main/java/com/hbm/tileentity/TileMappings.java b/src/main/java/com/hbm/tileentity/TileMappings.java index 68d4604ae..a71101a50 100644 --- a/src/main/java/com/hbm/tileentity/TileMappings.java +++ b/src/main/java/com/hbm/tileentity/TileMappings.java @@ -420,6 +420,7 @@ public class TileMappings { put(TileEntityFusionBoiler.class, "tileentity_fusion_boiler"); put(TileEntityFusionMHDT.class, "tileentity_fusion_mhdt"); put(TileEntityFusionCoupler.class, "tileentity_fusion_coupler"); + put(TileEntityFusionPlasmaForge.class, "tileentity_fusion_plasma_forge"); } private static void putNetwork() { diff --git a/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java b/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java new file mode 100644 index 000000000..830057d3d --- /dev/null +++ b/src/main/java/com/hbm/tileentity/machine/fusion/TileEntityFusionPlasmaForge.java @@ -0,0 +1,7 @@ +package com.hbm.tileentity.machine.fusion; + +import net.minecraft.tileentity.TileEntity; + +public class TileEntityFusionPlasmaForge extends TileEntity { + +} diff --git a/src/main/resources/assets/hbm/models/fusion/plasma_forge.obj b/src/main/resources/assets/hbm/models/fusion/plasma_forge.obj index 907a63e3b..d8a5266ab 100644 --- a/src/main/resources/assets/hbm/models/fusion/plasma_forge.obj +++ b/src/main/resources/assets/hbm/models/fusion/plasma_forge.obj @@ -1562,7 +1562,7 @@ f 340/592/78 344/596/78 343/593/78 f 337/591/79 342/598/79 341/595/79 f 339/589/80 341/595/80 344/596/80 f 338/597/81 343/599/81 342/598/81 -o PistonRight_Pistonright +o PistonRight v -1.375000 4.250000 1.125000 v -1.625000 4.250000 1.125000 v -1.375000 4.250000 0.875000 diff --git a/src/main/resources/assets/hbm/textures/models/fusion/plasma_forge.png b/src/main/resources/assets/hbm/textures/models/fusion/plasma_forge.png index 7ac40ddb0..b68caac73 100644 Binary files a/src/main/resources/assets/hbm/textures/models/fusion/plasma_forge.png and b/src/main/resources/assets/hbm/textures/models/fusion/plasma_forge.png differ