Blocks moved to TRContent

This commit is contained in:
drcrazy 2018-09-24 15:45:48 +03:00
parent 9f9595f955
commit dd94ff31c9
69 changed files with 614 additions and 603 deletions

View file

@ -31,7 +31,6 @@ import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.ModelLoader;
import techreborn.TechReborn;
import techreborn.config.ConfigTechReborn;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
public class RegisterItemJsons {
@ -119,11 +118,11 @@ public class RegisterItemJsons {
registerBlockstateMultiItem(TRContent.BRONZE_HOE, "bronze_hoe", "items/tool");
}
register(TRBlocks.RUBBER_SAPLING, "misc/rubber_sapling");
register(TRContent.RUBBER_SAPLING, "misc/rubber_sapling");
}
private static void registerBlocks() {
register(TRBlocks.REFINED_IRON_FENCE, "iron_fence");
register(TRContent.REFINED_IRON_FENCE, "iron_fence");
}
private static void register(Item item, int meta, String name) {

View file

@ -37,7 +37,7 @@ import reborncore.common.powerSystem.PowerSystem;
import reborncore.common.util.Torus;
import techreborn.client.gui.widget.GuiButtonHologram;
import techreborn.client.gui.widget.GuiButtonUpDown;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
import techreborn.packets.PacketFusionControlSize;
import techreborn.proxies.ClientProxy;
import techreborn.tiles.fusionReactor.TileFusionControlComputer;
@ -150,7 +150,7 @@ public class GuiFusionReactor extends GuiBase {
private void updateMultiBlockRender(){
final Multiblock multiblock = new Multiblock();
IBlockState coil = TRBlocks.FUSION_COIL.getDefaultState();
IBlockState coil = TRContent.FUSION_COIL.getDefaultState();
List<BlockPos> coils = Torus.generate(new BlockPos(0, 0, 0), tile.size);
coils.forEach(pos -> addComponent(pos.getX(), pos.getY(), pos.getZ(), coil, multiblock));

View file

@ -34,7 +34,7 @@ import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import techreborn.blocks.BlockNuke;
import techreborn.entities.EntityNukePrimed;
import techreborn.init.TRBlocks;
import techreborn.init.TRContent;
/**
* Created by Mark on 13/03/2016.
@ -61,7 +61,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
}
this.bindEntityTexture(entity);
GlStateManager.translate(-0.5F, -0.5F, 0.5F);
blockrendererdispatcher.renderBlockBrightness(TRBlocks.NUKE.getDefaultState(),
blockrendererdispatcher.renderBlockBrightness(TRContent.NUKE.getDefaultState(),
entity.getBrightness());
GlStateManager.translate(0.0F, 0.0F, 1.0F);
if (entity.getFuse() / 5 % 2 == 0) {
@ -72,7 +72,7 @@ public class RenderNukePrimed extends Render<EntityNukePrimed> {
GlStateManager.doPolygonOffset(-3.0F, -3.0F);
GlStateManager.enablePolygonOffset();
blockrendererdispatcher.renderBlockBrightness(
TRBlocks.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
TRContent.NUKE.getDefaultState().withProperty(BlockNuke.OVERLAY, true), 1.0F);
GlStateManager.doPolygonOffset(0.0F, 0.0F);
GlStateManager.disablePolygonOffset();
GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);