Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/main/java/tconstruct/smeltery/SmelteryProxyClient.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@
import tconstruct.smeltery.model.CastingBlockRender;
import tconstruct.smeltery.model.CastingTableSpecialRenderer;
import tconstruct.smeltery.model.PaneConnectedRender;
import tconstruct.smeltery.model.PaneRender;
import tconstruct.smeltery.model.SmelteryRender;
import tconstruct.smeltery.model.TankItemRenderer;
import tconstruct.smeltery.model.TankRender;
Expand All @@ -49,7 +48,6 @@ void registerRenderer() {
RenderingRegistry.registerBlockHandler(new TankRender());
RenderingRegistry.registerBlockHandler(new CastingBlockRender());
RenderingRegistry.registerBlockHandler(new DryingRackRender());
RenderingRegistry.registerBlockHandler(new PaneRender());
RenderingRegistry.registerBlockHandler(new PaneConnectedRender());
RenderingRegistry.registerBlockHandler(new RenderBlockFluid());
RenderingRegistry.registerBlockHandler(new BlockRenderCastingChannel());
Expand Down
24 changes: 20 additions & 4 deletions src/main/java/tconstruct/smeltery/TinkerSmeltery.java
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
import tconstruct.smeltery.blocks.GlassBlockConnected;
import tconstruct.smeltery.blocks.GlassBlockConnectedMeta;
import tconstruct.smeltery.blocks.GlassPaneConnected;
import tconstruct.smeltery.blocks.GlassPaneStained;
import tconstruct.smeltery.blocks.GlassPaneConnectedMeta;
import tconstruct.smeltery.blocks.GlueBlock;
import tconstruct.smeltery.blocks.GlueFluid;
import tconstruct.smeltery.blocks.LavaTankBlock;
Expand Down Expand Up @@ -511,7 +511,6 @@ public void preInit(FMLPreInitializationEvent event) {

// Glass
TinkerSmeltery.clearGlass = new GlassBlockConnected("clear", false).setBlockName("GlassBlock");
TinkerSmeltery.clearGlass.stepSound = Block.soundTypeGlass;
TinkerSmeltery.glassPane = new GlassPaneConnected("clear", false);
TinkerSmeltery.stainedGlassClear = new GlassBlockConnectedMeta(
"stained",
Expand All @@ -532,8 +531,25 @@ public void preInit(FMLPreInitializationEvent event) {
"green",
"red",
"black").setBlockName("GlassBlock.StainedClear");
TinkerSmeltery.stainedGlassClear.stepSound = Block.soundTypeGlass;
TinkerSmeltery.stainedGlassClearPane = new GlassPaneStained();
TinkerSmeltery.stainedGlassClearPane = new GlassPaneConnectedMeta(
"stained",
true,
"white",
"orange",
"magenta",
"light_blue",
"yellow",
"lime",
"pink",
"gray",
"light_gray",
"cyan",
"purple",
"blue",
"brown",
"green",
"red",
"black");

GameRegistry.registerBlock(TinkerSmeltery.searedSlab, SearedSlabItem.class, "SearedSlab");
GameRegistry.registerBlock(TinkerSmeltery.speedSlab, SpeedSlabItem.class, "SpeedSlab");
Expand Down
73 changes: 0 additions & 73 deletions src/main/java/tconstruct/smeltery/blocks/GlassBlock.java

This file was deleted.

Loading
Loading