diff --git a/changelog b/changelog index 71781d6b4..e6bde3d38 100644 --- a/changelog +++ b/changelog @@ -2,6 +2,7 @@ * Plushies ## Changed +* Updated chinese localization * The fluid burner, heat exchanging heater and cooling tower now use the single steel pipe items instead of the larger steel pipes * Reduced the amount of condensers needed for crafting the cooling towers * Liquefactors and solidifiers now have a base processing time of 5 seconds per operation (instead of 10) @@ -17,6 +18,7 @@ * Decreased hardness of slag blocks * Removed legacy circuits * Removed a bunch of random unused items +* Centrifuges are now configurable via `hbmMachines.json` ## Fixed * Fixed crash caused by decontaminating items with the radiolysis machine @@ -27,6 +29,7 @@ * Fixed radiolysis recipes not showing up in NEI unless the usage recipes are loaded first * Fixed autocrafter's grid not properly updating when using NEI drag and drop for the filter * Fixed all carbon-based crucible materials having the wrong ID, this fix will shift IDs but prevent collisions with silicon -* Fixed primary bedrock ore fraction roasing yielding one extra pile of crumbs +* Fixed primary bedrock ore fraction roasting yielding one extra pile of crumbs * Fixed filing cabinets being unreasonably laggy due to the old packet code -* Fixed the secure access door taking way longer to craft than any other door \ No newline at end of file +* Fixed the secure access door taking way longer to craft than any other door +* Fixed issues with the spotlight crafting recipes \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index e925744a2..05ee52d24 100644 --- a/gradle.properties +++ b/gradle.properties @@ -11,7 +11,7 @@ credits=HbMinecraft,\ \ Alcater (GUI textures, porting),\ \ MellowArpeggiation (new animation system, turbine sounds, sound fixes, industrial lights, better particle diodes),\ \ Pheo (textures, various machines, models, weapons),\ - \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide),\ + \ Vær (gas centrifuges, better worldgen, ZIRNOX, CP-1 parts, starter guide, new cyclotron),\ \ LePeep (coilgun model, BDCL QC),\ \ Adam29 (liquid petroleum, ethanol, electric furnace),\ \ Pvndols (thorium fuel recipe, gas turbine),\ @@ -19,15 +19,16 @@ credits=HbMinecraft,\ \ Doctor17 (russian localization)),\ \ Pashtet (russian localization),\ \ Bismarck (chinese localization),\ + \ Creeper-banner (chinese localization),\ \ Maksymisio (polish localization)\ \ el3ctro4ndre (italian localization),\ \ Pu-238 (Tom impact effects),\ - \ UFFR (RTGs, guns, casings, euphemium capacitor),\ - \ Frooz (models),\ + \ UFFR (RTG pellets, guns, casings, euphemium capacitor),\ + \ Frooz (gun models),\ \ VT-6/24 (models, textures),\ \ Nos (models),\ \ Minecreep (models),\ - \ 70k (textures, glyphid AI, strand caster),\ + \ 70k (textures, glyphid AI, strand caster, electrolyzer changes),\ \ haru315 (spiral point algorithm),\ \ Sten89 (models),\ \ Pixelguru26 (textures),\ @@ -37,13 +38,14 @@ credits=HbMinecraft,\ \ Silly541 (config for safe ME drives),\ \ Voxelstice (OpenComputers integration, turbine spinup),\ \ BallOfEnergy1 (OpenComputers integration),\ - \ martemen (project settings),\ \ sdddddf80 (recipe configs, chinese localization, custom machine holograms),\ \ SuperCraftAlex (tooltips)\ \ Ice-Arrow (research reactor tweaks),\ \ 245tt (anvil GUI improvements),\ \ KoblizekXD (doors),\ \ FOlkvangrField (custom machine parts),\ + \ RosaTryp (centrifuge config),\ \ Toshayo (satellite loot system, project settings, gradle curse task),\ + \ martemen (project settings),\ \ OvermindDL1 (project settings),\ - \ impbk2002 (project settings),\ + \ impbk2002 (project settings)\ diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 51c055603..6736f4aa9 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -148,11 +148,6 @@ public class ModBlocks { public static Block ore_tikite; - public static Block crystal_power; - public static Block crystal_energy; - public static Block crystal_robust; - public static Block crystal_trixite; - public static Block block_thorium; public static Block block_thorium_fuel; public static Block block_uranium; @@ -273,8 +268,6 @@ public class ModBlocks { public static Block snowglobe; public static Block plushie; - public static Block hazmat; - public static Block gravel_obsidian; public static Block gravel_diamond; public static Block asphalt; @@ -1329,11 +1322,6 @@ public class ModBlocks { ore_bedrock_oil = new BlockGeneric(Material.rock).setBlockName("ore_bedrock_oil").setCreativeTab(MainRegistry.blockTab).setBlockUnbreakable().setResistance(1_000_000).setBlockTextureName(RefStrings.MODID + ":ore_bedrock_oil"); ore_tikite = new BlockDragonProof(Material.rock).setBlockName("ore_tikite").setCreativeTab(MainRegistry.blockTab).setHardness(5.0F).setResistance(10.0F).setBlockTextureName(RefStrings.MODID + ":ore_tikite_alt"); - - crystal_power = new BlockCrystal(Material.glass).setBlockName("crystal_power").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_power"); - crystal_energy = new BlockCrystal(Material.glass).setBlockName("crystal_energy").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_energy"); - crystal_robust = new BlockCrystal(Material.glass).setBlockName("crystal_robust").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(10.0F).setResistance(100.0F).setBlockTextureName(RefStrings.MODID + ":crystal_robust"); - crystal_trixite = new BlockCrystal(Material.glass).setBlockName("crystal_trixite").setStepSound(Block.soundTypeGlass).setCreativeTab(MainRegistry.blockTab).setHardness(2.0F).setResistance(1.0F).setBlockTextureName(RefStrings.MODID + ":crystal_trixite"); block_uranium = new BlockHazard().makeBeaconable().setBlockName("block_uranium").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_uranium"); block_u233 = new BlockHazard().makeBeaconable().setDisplayEffect(ExtDisplayEffect.RADFOG).setBlockName("block_u233").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(50.0F).setBlockTextureName(RefStrings.MODID + ":block_u233"); @@ -1454,7 +1442,6 @@ public class ModBlocks { bobblehead = new BlockBobble().setBlockName("bobblehead").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_steel"); snowglobe = new BlockSnowglobe().setBlockName("snowglobe").setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":glass_boron"); plushie = new BlockPlushie().setBlockName("plushie").setStepSound(Block.soundTypeCloth).setResistance(50_0000.0F).setCreativeTab(MainRegistry.blockTab).setHardness(0.0F).setResistance(0.0F).setBlockTextureName(RefStrings.MODID + ":block_fiberglass_side"); - hazmat = new BlockGeneric(Material.cloth).setBlockName("hazmat").setStepSound(Block.soundTypeCloth).setCreativeTab(MainRegistry.blockTab).setHardness(15.0F).setResistance(60.0F).setBlockTextureName(RefStrings.MODID + ":hazmat"); gravel_obsidian = new BlockFalling(Material.iron).setBlockName("gravel_obsidian").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(5.0F).setResistance(240.0F).setBlockTextureName(RefStrings.MODID + ":gravel_obsidian"); gravel_diamond = new BlockFalling(Material.sand).setBlockName("gravel_diamond").setCreativeTab(MainRegistry.blockTab).setStepSound(Block.soundTypeGravel).setHardness(0.6F).setBlockTextureName(RefStrings.MODID + ":gravel_diamond"); @@ -2451,12 +2438,6 @@ public class ModBlocks { //Secret register(stone_keyhole); - //Crystals - GameRegistry.registerBlock(crystal_power, crystal_power.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_energy, crystal_energy.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_robust, crystal_robust.getUnlocalizedName()); - GameRegistry.registerBlock(crystal_trixite, crystal_trixite.getUnlocalizedName()); - //Resource-bearing Stones register(stone_resource); register(stalagmite); @@ -2599,7 +2580,6 @@ public class ModBlocks { GameRegistry.registerBlock(bobblehead, ItemBlockMeta.class, bobblehead.getUnlocalizedName()); GameRegistry.registerBlock(snowglobe, ItemBlockMeta.class, snowglobe.getUnlocalizedName()); GameRegistry.registerBlock(plushie, ItemBlockBase.class, plushie.getUnlocalizedName()); - GameRegistry.registerBlock(hazmat, hazmat.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk, deco_rbmk.getUnlocalizedName()); GameRegistry.registerBlock(deco_rbmk_smooth, deco_rbmk_smooth.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrystal.java b/src/main/java/com/hbm/blocks/generic/BlockCrystal.java deleted file mode 100644 index 0204d0f78..000000000 --- a/src/main/java/com/hbm/blocks/generic/BlockCrystal.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.hbm.blocks.generic; - -import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; - -public class BlockCrystal extends BlockDragonProof { - - public BlockCrystal(Material mat) { - super(mat); - } - - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderType() { - return renderID; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - - @Override - public boolean renderAsNormalBlock() { - return false; - } - - @Override - public int onBlockPlaced(World world, int x, int y, int z, int side, float hX, float hY, float hZ, int meta) { - return side; - } -} diff --git a/src/main/java/com/hbm/crafting/MineralRecipes.java b/src/main/java/com/hbm/crafting/MineralRecipes.java index 5632a9dd6..db125cf8c 100644 --- a/src/main/java/com/hbm/crafting/MineralRecipes.java +++ b/src/main/java/com/hbm/crafting/MineralRecipes.java @@ -423,8 +423,6 @@ public class MineralRecipes { add1To9Pair(ModItems.powder_paleogenite, ModItems.powder_paleogenite_tiny); add1To9Pair(ModItems.ingot_osmiridium, ModItems.nugget_osmiridium); - GameRegistry.addRecipe(new ItemStack(ModBlocks.hazmat, 8), new Object[] { "###", "# #", "###", '#', ModItems.hazmat_cloth }); - GameRegistry.addRecipe(new ItemStack(ModItems.hazmat_cloth, 1), new Object[] { "#", '#', ModBlocks.hazmat }); GameRegistry.addRecipe(new ItemStack(ModItems.egg_balefire_shard, 1), new Object[] { "##", "##", '#', ModItems.powder_balefire }); add9To1(ModItems.cell_balefire, ModItems.egg_balefire_shard); diff --git a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java index 204553081..db090d982 100644 --- a/src/main/java/com/hbm/inventory/recipes/PressRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/PressRecipes.java @@ -64,7 +64,6 @@ public class PressRecipes extends SerializableRecipe { makeRecipe(StampType.FLAT, new OreDictStack(LAPIS.dust()), new ItemStack(Items.dye, 1, 4)); makeRecipe(StampType.FLAT, new OreDictStack(DIAMOND.dust()), Items.diamond); makeRecipe(StampType.FLAT, new OreDictStack(EMERALD.dust()), Items.emerald); - makeRecipe(StampType.FLAT, new ComparableStack(ModItems.pellet_coal), Items.diamond); makeRecipe(StampType.FLAT, new ComparableStack(ModItems.biomass), ModItems.biomass_compressed); makeRecipe(StampType.FLAT, new OreDictStack(ANY_COKE.gem()), ModItems.ingot_graphite); makeRecipe(StampType.FLAT, new ComparableStack(ModItems.meteorite_sword_reforged), ModItems.meteorite_sword_hardened); diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 7bd4d7df8..0dd074de1 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -663,7 +663,6 @@ public class ModItems { public static Item turbine_titanium; public static Item blade_tungsten; public static Item turbine_tungsten; - public static Item pellet_coal; public static Item ring_starmetal; public static Item flywheel_beryllium; @@ -2970,7 +2969,6 @@ public class ModItems { coil_gold = new Item().setUnlocalizedName("coil_gold").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold"); coil_gold_torus = new Item().setUnlocalizedName("coil_gold_torus").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":coil_gold_torus"); magnet_circular = new Item().setUnlocalizedName("magnet_circular").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":magnet_circular"); - pellet_coal = new Item().setUnlocalizedName("pellet_coal").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":pellet_coal"); component_limiter = new Item().setUnlocalizedName("component_limiter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_limiter"); component_emitter = new Item().setUnlocalizedName("component_emitter").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":component_emitter"); chlorine_pinwheel = new ItemInfiniteFluid(Fluids.CHLORINE, 1, 2).setUnlocalizedName("chlorine_pinwheel").setCreativeTab(MainRegistry.partsTab).setTextureName(RefStrings.MODID + ":chlorine_pinwheel"); @@ -6239,7 +6237,6 @@ public class ModItems { GameRegistry.registerItem(pellet_charged, pellet_charged.getUnlocalizedName()); GameRegistry.registerItem(pellet_gas, pellet_gas.getUnlocalizedName()); GameRegistry.registerItem(magnetron, magnetron.getUnlocalizedName()); - GameRegistry.registerItem(pellet_coal, pellet_coal.getUnlocalizedName()); //Engine Pieces GameRegistry.registerItem(piston_selenium, piston_selenium.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 6f3b52609..59c4708a6 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -852,7 +852,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerBlockHandler(new RenderPipe()); RenderingRegistry.registerBlockHandler(new RenderBattery()); RenderingRegistry.registerBlockHandler(new RenderAnvil()); - RenderingRegistry.registerBlockHandler(new RenderCrystal()); RenderingRegistry.registerBlockHandler(new RenderCable()); RenderingRegistry.registerBlockHandler(new RenderCableClassic()); RenderingRegistry.registerBlockHandler(new RenderTestPipe()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 4ece7c653..9b8c65473 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -102,7 +102,6 @@ public class CraftingManager { addRecipeAuto(Mats.MAT_DURA.make(ModItems.bolt, 16), new Object[] { "D", "D", 'D', DURA.ingot()}); addRecipeAuto(new ItemStack(ModItems.bolt_spike, 2), new Object[] { "BB", "B ", "B ", 'B', STEEL.bolt()}); addRecipeAuto(new ItemStack(ModItems.pipes_steel, 1), new Object[] { "B", "B", "B", 'B', STEEL.block() }); - addRecipeAuto(new ItemStack(ModItems.pellet_coal, 1), new Object[] { "PFP", "FOF", "PFP", 'P', COAL.dust(), 'F', Items.flint, 'O', ModBlocks.gravel_obsidian }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_PLASTIC.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 8), new Object[] { "DD", 'D', ANY_RUBBER.ingot() }); addRecipeAuto(new ItemStack(ModItems.plate_polymer, 16), new Object[] { "DD", 'D', FIBER.ingot()}); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index 27e0248d4..dd263e35e 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1392,6 +1392,12 @@ public class MainRegistry { ignoreMappings.add("hbm:item.energy_ball"); ignoreMappings.add("hbm:item.discharge"); ignoreMappings.add("hbm:item.empblast"); + ignoreMappings.add("hbm:tile.crystal_power"); + ignoreMappings.add("hbm:tile.crystal_energy"); + ignoreMappings.add("hbm:tile.crystal_robust"); + ignoreMappings.add("hbm:tile.crystal_trixite"); + ignoreMappings.add("hbm:tile.hazmat"); + ignoreMappings.add("hbm:item.pellet_coal"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/render/block/RenderCrystal.java b/src/main/java/com/hbm/render/block/RenderCrystal.java deleted file mode 100644 index 6cf4f830d..000000000 --- a/src/main/java/com/hbm/render/block/RenderCrystal.java +++ /dev/null @@ -1,108 +0,0 @@ -package com.hbm.render.block; - -import org.lwjgl.opengl.GL11; - -import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.generic.BlockCrystal; -import com.hbm.main.ResourceManager; -import com.hbm.render.util.ObjUtil; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; -import net.minecraftforge.client.model.obj.WavefrontObject; - -public class RenderCrystal implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { - - GL11.glPushMatrix(); - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, 0); - tessellator.setColorOpaque_F(1, 1, 1); - - if(renderer.hasOverrideBlockTexture()) { - iicon = renderer.overrideBlockTexture; - } - - GL11.glRotated(180, 0, 1, 0); - tessellator.startDrawingQuads(); - - if(block == ModBlocks.crystal_power) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_power, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_energy) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_energy, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_robust) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_robust, iicon, tessellator, 0, false); - if(block == ModBlocks.crystal_trixite) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_trixite, iicon, tessellator, 0, false); - - tessellator.draw(); - - GL11.glPopMatrix(); - } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, 0); - tessellator.setColorOpaque_F(1, 1, 1); - - if(renderer.hasOverrideBlockTexture()) { - iicon = renderer.overrideBlockTexture; - } - - tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z)); - tessellator.setColorOpaque_F(1, 1, 1); - - float flip = 0; - float rotation = 0; - - int meta = world.getBlockMetadata(x, y, z); - - if(meta == 0) - flip = (float)Math.PI; - - if(meta == 2) - rotation = 90F / 180F * (float) Math.PI; - - if(meta == 3) - rotation = 270F / 180F * (float) Math.PI; - - if(meta == 4) - rotation = 180F / 180F * (float)Math.PI; - - if(rotation != 0F || meta == 5) - flip = (float)Math.PI * 0.5F; - - tessellator.addTranslation(x + 0.5F, y + 0.5F, z + 0.5F); - - if(block == ModBlocks.crystal_power) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_power, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_energy) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_energy, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_robust) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_robust, iicon, tessellator, rotation, flip, true); - if(block == ModBlocks.crystal_trixite) - ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.crystal_trixite, iicon, tessellator, rotation, flip, true); - - tessellator.addTranslation(-x - 0.5F, -y - 0.5F, -z - 0.5F); - - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return true; - } - - @Override - public int getRenderId() { - return BlockCrystal.renderID; - } -} diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png deleted file mode 100644 index a6b18a234..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png deleted file mode 100644 index 7a5f29680..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_circle.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png deleted file mode 100644 index 646165eb1..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_flat.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png b/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png deleted file mode 100644 index 484111395..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/brick_dungeon_tile.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/cheater_virus_seed_alt.png b/src/main/resources/assets/hbm/textures/blocks/cheater_virus_seed_alt.png deleted file mode 100644 index 9c428a3b7..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/cheater_virus_seed_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/crystal_energy.png b/src/main/resources/assets/hbm/textures/blocks/crystal_energy.png deleted file mode 100644 index bff0743b9..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/crystal_energy.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/crystal_power.png b/src/main/resources/assets/hbm/textures/blocks/crystal_power.png deleted file mode 100644 index b9ff5beb0..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/crystal_power.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/crystal_robust.png b/src/main/resources/assets/hbm/textures/blocks/crystal_robust.png deleted file mode 100644 index 77eb74348..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/crystal_robust.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png b/src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png deleted file mode 100644 index 30fddb0b3..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/crystal_trixite.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/deco_steel_alt.png b/src/main/resources/assets/hbm/textures/blocks/deco_steel_alt.png deleted file mode 100644 index 937b41603..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/deco_steel_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/deco_titanium_alt.png b/src/main/resources/assets/hbm/textures/blocks/deco_titanium_alt.png deleted file mode 100644 index 2adcbba63..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/deco_titanium_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png b/src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png deleted file mode 100644 index b99a7abb9..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/deco_tungsten_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png deleted file mode 100644 index 1a00908d6..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_computer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png deleted file mode 100644 index 822c86ba4..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_conductor_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler.png deleted file mode 100644 index a4346b0df..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png deleted file mode 100644 index c4eb67842..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_cooler_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_core.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_core.png deleted file mode 100644 index b7deb184e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_core.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_hatch.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_hatch.png deleted file mode 100644 index e40535680..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_hatch.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png deleted file mode 100644 index 536f3cfef..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png.mcmeta b/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png.mcmeta deleted file mode 100644 index 55438bf34..000000000 --- a/src/main/resources/assets/hbm/textures/blocks/fwatz_plasma.png.mcmeta +++ /dev/null @@ -1,45 +0,0 @@ -{ - "animation": { - "frametime": 2, - "frames": [ - 0, - 1, - 2, - 3, - 4, - 5, - 6, - 7, - 8, - 9, - 10, - 11, - 12, - 13, - 14, - 15, - 16, - 17, - 18, - 19, - 18, - 17, - 16, - 15, - 14, - 13, - 12, - 11, - 10, - 9, - 8, - 7, - 6, - 5, - 4, - 3, - 2, - 1 - ] - } -} \ No newline at end of file diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_scaffold.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_scaffold.png deleted file mode 100644 index 7064b031b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_scaffold.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png b/src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png deleted file mode 100644 index 248ae197d..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/fwatz_tank.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/hazmat.png b/src/main/resources/assets/hbm/textures/blocks/hazmat.png deleted file mode 100644 index 92997dc0b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/hazmat.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png b/src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png deleted file mode 100644 index 049f1bae8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/hazmat_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png deleted file mode 100644 index 6763f77a4..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_fron_on.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_front_off.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_front_off.png deleted file mode 100644 index 18dcd258c..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_front_off.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png deleted file mode 100644 index 92fb934f8..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_off.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png deleted file mode 100644 index 2addbfbe7..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_on.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_side.png deleted file mode 100644 index 4ce572787..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png deleted file mode 100644 index aa6472535..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_gas_furnace_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_generator.png b/src/main/resources/assets/hbm/textures/blocks/machine_generator.png deleted file mode 100644 index 4a3bcf52e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_generator.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_generator_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_generator_side.png deleted file mode 100644 index 0026c42aa..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_generator_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_side_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_side_side.png deleted file mode 100644 index 23b4fbeab..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_side_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_top_alt.png b/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_top_alt.png deleted file mode 100644 index 6f02e9b08..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_keyforge_top_alt.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_side.png deleted file mode 100644 index fdd31750a..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png deleted file mode 100644 index b6d0a8511..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_minirtg_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_selenium.png b/src/main/resources/assets/hbm/textures/blocks/machine_selenium.png deleted file mode 100644 index 05523101a..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_selenium.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png b/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png deleted file mode 100644 index 2333c9bb3..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_side.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png b/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png deleted file mode 100644 index 99a32b91f..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/machine_telelinker_top.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/muffler.png b/src/main/resources/assets/hbm/textures/blocks/muffler.png deleted file mode 100644 index 57e0f1c03..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/muffler.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png b/src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png deleted file mode 100644 index b47cd705e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_cheapo.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_cwis.png b/src/main/resources/assets/hbm/textures/blocks/turret_cwis.png deleted file mode 100644 index 14cd0660e..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_cwis.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_flamer.png b/src/main/resources/assets/hbm/textures/blocks/turret_flamer.png deleted file mode 100644 index 471bf68f3..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_flamer.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_heavy.png b/src/main/resources/assets/hbm/textures/blocks/turret_heavy.png deleted file mode 100644 index 7922fff7b..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_heavy.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_light.png b/src/main/resources/assets/hbm/textures/blocks/turret_light.png deleted file mode 100644 index cefc65660..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_light.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_rocket.png b/src/main/resources/assets/hbm/textures/blocks/turret_rocket.png deleted file mode 100644 index 0a5a4c414..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_rocket.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/blocks/turret_tau.png b/src/main/resources/assets/hbm/textures/blocks/turret_tau.png deleted file mode 100644 index 19be1105c..000000000 Binary files a/src/main/resources/assets/hbm/textures/blocks/turret_tau.png and /dev/null differ diff --git a/src/main/resources/assets/hbm/textures/items/pellet_coal.png b/src/main/resources/assets/hbm/textures/items/pellet_coal.png deleted file mode 100644 index 0672275f8..000000000 Binary files a/src/main/resources/assets/hbm/textures/items/pellet_coal.png and /dev/null differ