Skip to content

Commit

Permalink
remove crusher blade
Browse files Browse the repository at this point in the history
  • Loading branch information
serenibyss committed Jul 6, 2021
1 parent b82d541 commit c416e5e
Show file tree
Hide file tree
Showing 10 changed files with 0 additions and 274 deletions.
2 changes: 0 additions & 2 deletions src/main/java/gregtech/common/CommonProxy.java
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@ public static void registerBlocks(RegistryEvent.Register<Block> event) {
registry.register(LOG);
registry.register(LEAVES);
registry.register(SAPLING);
registry.register(CRUSHER_BLADE);
registry.register(SURFACE_ROCK);

COMPRESSED.values().stream().distinct().forEach(registry::register);
Expand Down Expand Up @@ -127,7 +126,6 @@ public static void registerItems(RegistryEvent.Register<Item> event) {
registry.register(createMultiTexItemBlock(LOG, state -> state.getValue(BlockGregLog.VARIANT).getName()));
registry.register(createMultiTexItemBlock(LEAVES, state -> state.getValue(BlockGregLeaves.VARIANT).getName()));
registry.register(createMultiTexItemBlock(SAPLING, state -> state.getValue(BlockGregSapling.VARIANT).getName()));
registry.register(createItemBlock(CRUSHER_BLADE, ItemBlock::new));

COMPRESSED.values()
.stream().distinct()
Expand Down
108 changes: 0 additions & 108 deletions src/main/java/gregtech/common/blocks/BlockCrusherBlade.java

This file was deleted.

11 changes: 0 additions & 11 deletions src/main/java/gregtech/common/blocks/MetaBlocks.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
import gregtech.common.blocks.modelfactories.BakedModelHandler;
import gregtech.common.blocks.surfacerock.BlockSurfaceRock;
import gregtech.common.blocks.surfacerock.TileEntitySurfaceRock;
import gregtech.common.blocks.tileentity.TileEntityCrusherBlade;
import gregtech.common.blocks.wood.BlockGregLeaves;
import gregtech.common.blocks.wood.BlockGregLog;
import gregtech.common.blocks.wood.BlockGregSapling;
Expand All @@ -37,8 +36,6 @@
import gregtech.common.pipelike.fluidpipe.tile.TileEntityFluidPipeTickable;
import gregtech.common.render.CableRenderer;
import gregtech.common.render.FluidPipeRenderer;
import gregtech.common.render.tesr.TileEntityCrusherBladeRenderer;
import gregtech.common.render.tesr.TileEntityRendererBase.TileEntityRenderBaseItem;
import net.minecraft.block.Block;
import net.minecraft.block.BlockLog.EnumAxis;
import net.minecraft.block.properties.IProperty;
Expand Down Expand Up @@ -105,7 +102,6 @@ private MetaBlocks() {
public static BlockGregLeaves LEAVES;
public static BlockGregSapling SAPLING;

public static BlockCrusherBlade CRUSHER_BLADE;
public static BlockSurfaceRock SURFACE_ROCK;

public static Map<DustMaterial, BlockCompressed> COMPRESSED = new HashMap<>();
Expand Down Expand Up @@ -166,9 +162,6 @@ public static void init() {
SAPLING = new BlockGregSapling();
SAPLING.setRegistryName("sapling");

CRUSHER_BLADE = new BlockCrusherBlade();
CRUSHER_BLADE.setRegistryName("crusher_blade");

SURFACE_ROCK = new BlockSurfaceRock();
SURFACE_ROCK.setRegistryName("surface_rock_new");

Expand Down Expand Up @@ -279,7 +272,6 @@ private static void createOreBlock(DustMaterial material, StoneType[] stoneTypes

public static void registerTileEntity() {
GameRegistry.registerTileEntity(MetaTileEntityHolder.class, new ResourceLocation(GTValues.MODID, "machine"));
GameRegistry.registerTileEntity(TileEntityCrusherBlade.class, new ResourceLocation(GTValues.MODID, "crusher_blade"));
GameRegistry.registerTileEntity(TileEntityCable.class, new ResourceLocation(GTValues.MODID, "cable"));
GameRegistry.registerTileEntity(TileEntityCableTickable.class, new ResourceLocation(GTValues.MODID, "cable_tickable"));
GameRegistry.registerTileEntity(TileEntityFluidPipe.class, new ResourceLocation(GTValues.MODID, "fluid_pipe"));
Expand Down Expand Up @@ -392,10 +384,7 @@ protected ModelResourceLocation getModelResourceLocation(IBlockState state) {
FLUID_BLOCKS.forEach(modelHandler::addFluidBlock);

modelHandler.addBuiltInBlock(SURFACE_ROCK, "stone_andesite");
modelHandler.addBuiltInBlock(CRUSHER_BLADE, "iron_block");

Item.getItemFromBlock(CRUSHER_BLADE).setTileEntityItemStackRenderer(new TileEntityRenderBaseItem<>(TileEntityCrusherBlade.class));
ClientRegistry.bindTileEntitySpecialRenderer(TileEntityCrusherBlade.class, new TileEntityCrusherBladeRenderer());
ClientRegistry.bindTileEntitySpecialRenderer(MetaTileEntityHolder.class, new MetaTileEntityTESR());
}

Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

1 change: 0 additions & 1 deletion src/main/resources/assets/gregtech/lang/en_us.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1965,7 +1965,6 @@ tile.gt.foam.name=Foam
tile.gt.reinforced_foam.name=Reinforced Foam
tile.gt.petrified_foam.name=Petrified Foam
tile.gt.reinforced_stone.name=Reinforced Stone
tile.gt.crusher_blade.name=Crusher Blade
tile.gt.log.rubber_wood.name=Rubber Wood
tile.gt.leaves.rubber_wood.name=Rubber Tree Leaves
tile.gt.sapling.rubber_wood.name=Rubber Tree Sapling
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/gregtech/lang/ru_ru.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1599,7 +1599,6 @@ tile.gt.foam.name=Пена
tile.gt.reinforced_foam.name=Усиленная пена
tile.gt.petrified_foam.name=Окаменелая пена
tile.gt.reinforced_stone.name=Армированный камень
tile.gt.crusher_blade.name=Лезвие дробилки
tile.gt.log.rubber_wood.name=Каучуковое дерево
tile.gt.leaves.rubber_wood.name=Листья каучукового дерева
tile.gt.sapling.rubber_wood.name=Саженец каучукового дерева
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/assets/gregtech/lang/zh_cn.lang
Original file line number Diff line number Diff line change
Expand Up @@ -1583,7 +1583,6 @@ tile.gt.foam.name=建筑泡沫
tile.gt.reinforced_foam.name=强化建筑泡沫
tile.gt.petrified_foam.name=硬化建筑泡沫
tile.gt.reinforced_stone.name=防爆石
tile.crusher_blade.name=破碎机刀片
tile.gt.log.rubber_wood.name=橡胶木
tile.gt.leaves.rubber_wood.name=橡胶树叶
tile.gt.sapling.rubber_wood.name=橡胶树苗
Expand Down

0 comments on commit c416e5e

Please sign in to comment.