From 117076fe3c3f2a364bdd532431dafaf3ce2ec24f Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Mon, 2 May 2016 22:09:16 +0100 Subject: [PATCH] Fix up some things Move stuff that's probably not coming back soon out of source tree --- .../AdvancedMachineRecipeHandler.java | 0 .../BaseRecipeHandler.java | 0 .../ChanceMachineRecipeHandler.java | 0 .../ChemicalCrystallizerRecipeHandler.java | 0 ...emicalDissolutionChamberRecipeHandler.java | 0 .../ChemicalInfuserRecipeHandler.java | 0 ...ChemicalInjectionChamberRecipeHandler.java | 0 .../ChemicalOxidizerRecipeHandler.java | 0 .../ChemicalWasherRecipeHandler.java | 0 .../CombinerRecipeHandler.java | 0 .../CrusherRecipeHandler.java | 0 .../ElectrolyticSeparatorRecipeHandler.java | 0 .../ElementBoundHandler.java | 0 .../EnrichmentChamberRecipeHandler.java | 0 .../MachineRecipeHandler.java | 0 .../MekanismSlotClickHandler.java | 0 .../MetallurgicInfuserRecipeHandler.java | 0 .../NEIMekanismConfig.java | 0 .../OsmiumCompressorRecipeHandler.java | 0 .../PRCRecipeHandler.java | 0 .../PrecisionSawmillRecipeHandler.java | 0 .../PurificationChamberRecipeHandler.java | 0 .../RotaryCondensentratorRecipeHandler.java | 0 .../ShapedMekanismRecipeHandler.java | 0 .../ShapelessMekanismRecipeHandler.java | 0 .../SolarNeutronRecipeHandler.java | 0 .../ThermalEvaporationRecipeHandler.java | 0 .../BasicRenderingHandler.java | 0 .../CTMRenderingHandler.java | 0 .../MachineRenderingHandler.java | 0 .../PlasticRenderingHandler.java | 0 .../RenderBlocksCTM.java | 0 .../TextureSubmap.java | 0 .../TextureVirtual.java | 0 .../java/mekanism/client/ClientProxy.java | 2 - .../client/model/convert_modelbase.perl | 120 ------------------ .../java/mekanism/common/MekanismBlocks.java | 34 ++++- .../models/item/enrichment_chamber.json | 11 -- 38 files changed, 27 insertions(+), 140 deletions(-) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/AdvancedMachineRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/BaseRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChanceMachineRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalCrystallizerRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalDissolutionChamberRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalInfuserRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalInjectionChamberRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalOxidizerRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ChemicalWasherRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/CombinerRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/CrusherRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ElectrolyticSeparatorRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ElementBoundHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/EnrichmentChamberRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/MachineRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/MekanismSlotClickHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/MetallurgicInfuserRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/NEIMekanismConfig.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/OsmiumCompressorRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/PRCRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/PrecisionSawmillRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/PurificationChamberRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/RotaryCondensentratorRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ShapedMekanismRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ShapelessMekanismRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/SolarNeutronRecipeHandler.java (100%) rename {src/main/java/mekanism/client/nei => legacy/mekanism.client.nei}/ThermalEvaporationRecipeHandler.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/BasicRenderingHandler.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/CTMRenderingHandler.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/MachineRenderingHandler.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/PlasticRenderingHandler.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/RenderBlocksCTM.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/TextureSubmap.java (100%) rename {src/main/java/mekanism/client/render/block => legacy/mekanism.client.render.block}/TextureVirtual.java (100%) delete mode 100644 src/main/java/mekanism/client/model/convert_modelbase.perl delete mode 100644 src/main/resources/assets/mekanism/models/item/enrichment_chamber.json diff --git a/src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java b/legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/AdvancedMachineRecipeHandler.java rename to legacy/mekanism.client.nei/AdvancedMachineRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/BaseRecipeHandler.java b/legacy/mekanism.client.nei/BaseRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/BaseRecipeHandler.java rename to legacy/mekanism.client.nei/BaseRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java b/legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChanceMachineRecipeHandler.java rename to legacy/mekanism.client.nei/ChanceMachineRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalCrystallizerRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalCrystallizerRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalDissolutionChamberRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalDissolutionChamberRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalInfuserRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalInfuserRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalInjectionChamberRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalInjectionChamberRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalOxidizerRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalOxidizerRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java rename to legacy/mekanism.client.nei/ChemicalWasherRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/CombinerRecipeHandler.java b/legacy/mekanism.client.nei/CombinerRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/CombinerRecipeHandler.java rename to legacy/mekanism.client.nei/CombinerRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/CrusherRecipeHandler.java b/legacy/mekanism.client.nei/CrusherRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/CrusherRecipeHandler.java rename to legacy/mekanism.client.nei/CrusherRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java rename to legacy/mekanism.client.nei/ElectrolyticSeparatorRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ElementBoundHandler.java b/legacy/mekanism.client.nei/ElementBoundHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ElementBoundHandler.java rename to legacy/mekanism.client.nei/ElementBoundHandler.java diff --git a/src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java b/legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/EnrichmentChamberRecipeHandler.java rename to legacy/mekanism.client.nei/EnrichmentChamberRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/MachineRecipeHandler.java b/legacy/mekanism.client.nei/MachineRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/MachineRecipeHandler.java rename to legacy/mekanism.client.nei/MachineRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java b/legacy/mekanism.client.nei/MekanismSlotClickHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/MekanismSlotClickHandler.java rename to legacy/mekanism.client.nei/MekanismSlotClickHandler.java diff --git a/src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java b/legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/MetallurgicInfuserRecipeHandler.java rename to legacy/mekanism.client.nei/MetallurgicInfuserRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/NEIMekanismConfig.java b/legacy/mekanism.client.nei/NEIMekanismConfig.java similarity index 100% rename from src/main/java/mekanism/client/nei/NEIMekanismConfig.java rename to legacy/mekanism.client.nei/NEIMekanismConfig.java diff --git a/src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java b/legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/OsmiumCompressorRecipeHandler.java rename to legacy/mekanism.client.nei/OsmiumCompressorRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/legacy/mekanism.client.nei/PRCRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/PRCRecipeHandler.java rename to legacy/mekanism.client.nei/PRCRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java b/legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/PrecisionSawmillRecipeHandler.java rename to legacy/mekanism.client.nei/PrecisionSawmillRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java b/legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/PurificationChamberRecipeHandler.java rename to legacy/mekanism.client.nei/PurificationChamberRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java rename to legacy/mekanism.client.nei/RotaryCondensentratorRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ShapedMekanismRecipeHandler.java rename to legacy/mekanism.client.nei/ShapedMekanismRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java b/legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ShapelessMekanismRecipeHandler.java rename to legacy/mekanism.client.nei/ShapelessMekanismRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java b/legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/SolarNeutronRecipeHandler.java rename to legacy/mekanism.client.nei/SolarNeutronRecipeHandler.java diff --git a/src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java b/legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java similarity index 100% rename from src/main/java/mekanism/client/nei/ThermalEvaporationRecipeHandler.java rename to legacy/mekanism.client.nei/ThermalEvaporationRecipeHandler.java diff --git a/src/main/java/mekanism/client/render/block/BasicRenderingHandler.java b/legacy/mekanism.client.render.block/BasicRenderingHandler.java similarity index 100% rename from src/main/java/mekanism/client/render/block/BasicRenderingHandler.java rename to legacy/mekanism.client.render.block/BasicRenderingHandler.java diff --git a/src/main/java/mekanism/client/render/block/CTMRenderingHandler.java b/legacy/mekanism.client.render.block/CTMRenderingHandler.java similarity index 100% rename from src/main/java/mekanism/client/render/block/CTMRenderingHandler.java rename to legacy/mekanism.client.render.block/CTMRenderingHandler.java diff --git a/src/main/java/mekanism/client/render/block/MachineRenderingHandler.java b/legacy/mekanism.client.render.block/MachineRenderingHandler.java similarity index 100% rename from src/main/java/mekanism/client/render/block/MachineRenderingHandler.java rename to legacy/mekanism.client.render.block/MachineRenderingHandler.java diff --git a/src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java b/legacy/mekanism.client.render.block/PlasticRenderingHandler.java similarity index 100% rename from src/main/java/mekanism/client/render/block/PlasticRenderingHandler.java rename to legacy/mekanism.client.render.block/PlasticRenderingHandler.java diff --git a/src/main/java/mekanism/client/render/block/RenderBlocksCTM.java b/legacy/mekanism.client.render.block/RenderBlocksCTM.java similarity index 100% rename from src/main/java/mekanism/client/render/block/RenderBlocksCTM.java rename to legacy/mekanism.client.render.block/RenderBlocksCTM.java diff --git a/src/main/java/mekanism/client/render/block/TextureSubmap.java b/legacy/mekanism.client.render.block/TextureSubmap.java similarity index 100% rename from src/main/java/mekanism/client/render/block/TextureSubmap.java rename to legacy/mekanism.client.render.block/TextureSubmap.java diff --git a/src/main/java/mekanism/client/render/block/TextureVirtual.java b/legacy/mekanism.client.render.block/TextureVirtual.java similarity index 100% rename from src/main/java/mekanism/client/render/block/TextureVirtual.java rename to legacy/mekanism.client.render.block/TextureVirtual.java diff --git a/src/main/java/mekanism/client/ClientProxy.java b/src/main/java/mekanism/client/ClientProxy.java index a86eca204..e4a4ade1e 100644 --- a/src/main/java/mekanism/client/ClientProxy.java +++ b/src/main/java/mekanism/client/ClientProxy.java @@ -449,8 +449,6 @@ public class ClientProxy extends CommonProxy registerItemRender(MekanismItems.FactoryInstaller); registerItemRender(MekanismItems.OtherDust); - OBJLoader.instance.addDomain("mekanism"); - Mekanism.logger.info("Render registrations complete."); } diff --git a/src/main/java/mekanism/client/model/convert_modelbase.perl b/src/main/java/mekanism/client/model/convert_modelbase.perl deleted file mode 100644 index 3991fc4c5..000000000 --- a/src/main/java/mekanism/client/model/convert_modelbase.perl +++ /dev/null @@ -1,120 +0,0 @@ -#!/usr/bin/env perl -# Released into Public Domain - -# A quick and dirty script to convert ModelBase Java code as generated -# by Techne into Minecraft's JSON model format. -# It is quite limited (it does not handle rotations), but it is at least a help. - -# Note that Minecraft requires the texure to be square, so you might need to -# resize your texture - -use strict; -use warnings; -use List::Util qw[max]; - -my %parts; - -while(<>) { - if(/\s*(\S+) = new ModelRenderer\(this, (\d+), (\d+)\);/) { - $parts{$1}{base_uv} = [$2, $3]; - } - elsif(/\s*(\S+)\.addBox\((-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (\d+), (\d+), (\d+)\);/) { - $parts{$1}{offset} = [$2, $3, $4]; - $parts{$1}{size} = [$5, $6, $7]; - } - elsif(/\s*(\S+)\.setRotationPoint\((-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?\);/) { - $parts{$1}{rot_point} = [$2, $3, $4]; - } - elsif(/\s*(\S+)\.setTextureSize\((\d+), (\d+)\);/) { - $parts{$1}{tex_size} = [$2, $3]; - } - elsif(/\s*(\S+)\.mirror = (true|false);/) { - $parts{$1}{mirror} = ($2 eq "true"); - } - elsif(/\s*setRotation\((\S+), (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?, (-?\d*\.?\d*)[Ff]?\)/) { - #$parts{$1}{rotation} = [$2, $3, $4]; - #We ignore the rotation - } - else { - #print STDERR "Ignoring line $.\n"; - } -} - -print "{ - \"elements\": [ -"; - -my $first = 1; - -foreach my $part (keys %parts) { - my $offset = $parts{$part}{offset}; - my $size = $parts{$part}{size}; - my $rot_point = $parts{$part}{rot_point}; - #Textures need to be square - my $tex_size = max($parts{$part}{tex_size}->[0], $parts{$part}{tex_size}->[1]); - my $base_uv = $parts{$part}{base_uv}; - - my $xmin = 8 + $offset->[0] + $rot_point->[0]; - my $ymin = 23 - $offset->[1] - $size->[1] - $rot_point->[1]; - my $zmin = 8 + $offset->[2] + $rot_point->[2]; - - my $xmax = 8 + $offset->[0] + $size->[0] + $rot_point->[0]; - my $ymax = 23 - $offset->[1] - $rot_point->[1]; - my $zmax = 8 + $offset->[2] + $size->[2] + $rot_point->[2]; - - my @uvmin = ( - [$base_uv->[0] + $size->[2] + $size->[0], $base_uv->[1]], #down - [$base_uv->[0] + $size->[2], $base_uv->[1]], #up - [$base_uv->[0] + $size->[2], $base_uv->[1] + $size->[2]], #north - [$base_uv->[0] + 2*$size->[2] + $size->[0], $base_uv->[1] + $size->[2]], #south - [$base_uv->[0] + $size->[2] + $size->[0], $base_uv->[1] + $size->[2]], #west - [$base_uv->[0], $base_uv->[1] + $size->[2]]); #east - - my @uvmax = ( - [$uvmin[0][0] + $size->[0], $uvmin[0][1] + $size->[2]], #down - [$uvmin[1][0] + $size->[0], $uvmin[1][1] + $size->[2]], #up - [$uvmin[2][0] + $size->[0], $uvmin[2][1] + $size->[1]], #north - [$uvmin[3][0] + $size->[0], $uvmin[3][1] + $size->[1]], #south - [$uvmin[4][0] + $size->[2], $uvmin[4][1] + $size->[1]], #west - [$uvmin[5][0] + $size->[2], $uvmin[5][1] + $size->[1]]); #east - - #Scale UVs from 0 to 16 with respect to texture size - foreach my $f (@uvmin) { - foreach (@$f) { - $_ = $_ / $tex_size * 16; - } - } - foreach my $f (@uvmax) { - foreach (@$f) { - $_ = $_ / $tex_size * 16; - } - } - - print ",\n" unless $first; - $first = 0; - - print -" { - \"__comment\": \"$part\", - \"from\": [$xmin, $ymin, $zmin], - \"to\": [$xmax, $ymax, $zmax], - \"faces\": { - \"down\": {\"uv\": [$uvmin[0][0], $uvmin[0][1], $uvmax[0][0], $uvmax[0][1]], \"texture\": \"#all\"}, - \"up\": {\"uv\": [$uvmin[1][0], $uvmin[1][1], $uvmax[1][0], $uvmax[1][1]], \"texture\": \"#all\"}, - \"north\": {\"uv\": [$uvmin[2][0], $uvmin[2][1], $uvmax[2][0], $uvmax[2][1]], \"texture\": \"#all\"}, - \"south\": {\"uv\": [$uvmin[3][0], $uvmin[3][1], $uvmax[3][0], $uvmax[3][1]], \"texture\": \"#all\"}, - \"west\": {\"uv\": [$uvmin[4][0], $uvmin[4][1], $uvmax[4][0], $uvmax[4][1]], \"texture\": \"#all\"}, - \"east\": {\"uv\": [$uvmin[5][0], $uvmin[5][1], $uvmax[5][0], $uvmax[5][1]], \"texture\": \"#all\"} - } - }"; -} - -print " - ], - \"textures\": { - \"all\": \"...\", - \"particle\": \"...\" - } -} -"; - diff --git a/src/main/java/mekanism/common/MekanismBlocks.java b/src/main/java/mekanism/common/MekanismBlocks.java index 4198f2acb..4cb90009e 100644 --- a/src/main/java/mekanism/common/MekanismBlocks.java +++ b/src/main/java/mekanism/common/MekanismBlocks.java @@ -6,7 +6,9 @@ import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHIN import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_2; import static mekanism.common.block.states.BlockStateMachine.MachineBlock.MACHINE_BLOCK_3; +import mekanism.api.EnumColor; import mekanism.common.Tier.EnergyCubeTier; +import mekanism.common.Tier.GasTankTier; import mekanism.common.base.IEnergyCube; import mekanism.common.block.BlockBasic; import mekanism.common.block.BlockBounding; @@ -24,6 +26,8 @@ import mekanism.common.block.BlockPlastic; import mekanism.common.block.BlockPlasticFence; import mekanism.common.block.BlockSalt; import mekanism.common.block.states.BlockStateMachine; +import mekanism.common.block.states.BlockStateOre; +import mekanism.common.block.states.BlockStateOre.EnumOreType; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockStateMapper; import mekanism.common.block.states.BlockStatePlastic.PlasticBlockType; import mekanism.common.item.ItemBlockBasic; @@ -115,9 +119,11 @@ public class MekanismBlocks ModelLoader.setCustomStateMapper(ReinforcedPlasticBlock, plasticMapper); ModelLoader.setCustomStateMapper(RoadPlasticBlock, plasticMapper); - for(MachineType type : BlockStateMachine.MachineType.values()) + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ObsidianTNT), 0, new ModelResourceLocation("mekanism:ObsidianTNT", "inventory")); + + for(MachineType type : MachineType.values()) { - ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.typeBlock.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "active=false,facing=north")); } for(BasicBlockType type : BasicBlockType.values()) @@ -125,6 +131,25 @@ public class MekanismBlocks ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(type.blockType.getBlock()), type.meta, new ModelResourceLocation("mekanism:" + type.getName(), "inventory")); } + for(EnumColor color : EnumColor.DYES) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(PlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=plastic")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(SlickPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=slick")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GlowPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=glow")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(ReinforcedPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=reinforced")); + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(RoadPlasticBlock), color.getMetaValue(), new ModelResourceLocation("mekanism:plastic_block", "type=road")); + } + + for(EnumOreType ore : EnumOreType.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(OreBlock), ore.ordinal(), new ModelResourceLocation("mekanism:OreBlock", "type=" + ore.getName())); + } + + for(GasTankTier tier : GasTankTier.values()) + { + ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(GasTank), tier.ordinal(), new ModelResourceLocation("mekanism:GasTank", "inventory")); //TODO tier states + } + ModelLoader.setCustomMeshDefinition(Item.getItemFromBlock(EnergyCube), new ItemMeshDefinition() { @Override public ModelResourceLocation getModelLocation(ItemStack stack) @@ -135,9 +160,4 @@ public class MekanismBlocks } }); } - - @SideOnly(Side.CLIENT) - public static void registerRender() - { - } } diff --git a/src/main/resources/assets/mekanism/models/item/enrichment_chamber.json b/src/main/resources/assets/mekanism/models/item/enrichment_chamber.json deleted file mode 100644 index 051c80a8e..000000000 --- a/src/main/resources/assets/mekanism/models/item/enrichment_chamber.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "parent": "mekanism:block/enrichment_chamber", - "display": { - "thirdperson": { - "rotation": [ 10, -45, 170 ], - "translation": [ 0, 1.5, -2.75 ], - "scale": [ 0.375, 0.375, 0.375 ] - } - } -} -