From a5550b9bb4d4698ca197eac316f78c86e92003aa Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 19 Sep 2016 20:58:34 +0100 Subject: [PATCH] Fix a load of issues --- .../client/render/ModelDynamicCell.java | 8 +++--- src/main/java/techreborn/init/ModBlocks.java | 2 -- src/main/java/techreborn/init/ModItems.java | 3 +++ src/main/java/techreborn/init/ModRecipes.java | 8 ++++++ .../techreborn/world/TechRebornWorldGen.java | 27 +++++++++++++++++++ 5 files changed, 43 insertions(+), 5 deletions(-) diff --git a/src/main/java/techreborn/client/render/ModelDynamicCell.java b/src/main/java/techreborn/client/render/ModelDynamicCell.java index 40b104877..6ccea5105 100644 --- a/src/main/java/techreborn/client/render/ModelDynamicCell.java +++ b/src/main/java/techreborn/client/render/ModelDynamicCell.java @@ -89,9 +89,11 @@ public class ModelDynamicCell implements IModel { ResourceLocation sprite = fluid != null ? fluid.getStill() : emptyTexture; int color = fluid != null ? fluid.getColor() : Color.WHITE.getRGB(); TextureAtlasSprite fluidSprite = bakedTextureGetter.apply(sprite); - if (fluidSprite != null) { - builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color)); - builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color)); + if(fluid != null){ + if (fluidSprite != null) { + builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, NORTH_Z_FLUID, fluidSprite, EnumFacing.NORTH, color)); + builder.add(ItemTextureQuadConverter.genQuad(format, transform, 5, 2, 11, 14, SOUTH_Z_FLUID, fluidSprite, EnumFacing.SOUTH, color)); + } } return new BakedDynamicCell(builder.build(), this, bakedTextureGetter.apply(baseTexture), format, transformMap); diff --git a/src/main/java/techreborn/init/ModBlocks.java b/src/main/java/techreborn/init/ModBlocks.java index d937151e4..d8a6b58f2 100644 --- a/src/main/java/techreborn/init/ModBlocks.java +++ b/src/main/java/techreborn/init/ModBlocks.java @@ -517,8 +517,6 @@ public class ModBlocks OreDictionary.registerOre("machineBlockAdvanced", BlockMachineFrame.getFrameByName("advancedMachine", 1)); OreDictionary.registerOre("machineBlockHighlyAdvanced", BlockMachineFrame.getFrameByName("highlyAdvancedMachine", 1)); - - OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber")); } } diff --git a/src/main/java/techreborn/init/ModItems.java b/src/main/java/techreborn/init/ModItems.java index ce6aa8b8c..b060907c2 100644 --- a/src/main/java/techreborn/init/ModItems.java +++ b/src/main/java/techreborn/init/ModItems.java @@ -8,6 +8,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.fluids.FluidContainerRegistry; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fml.common.registry.GameRegistry; +import net.minecraftforge.oredict.OreDictionary; import reborncore.common.blocks.BlockMachineBase; import reborncore.common.powerSystem.PoweredItem; import reborncore.common.util.BucketHandler; @@ -309,6 +310,8 @@ public class ModItems BlockMachineBase.advancedMachineStack = BlockMachineFrame.getFrameByName("advancedMachine", 1); BlockMachineBase.machineStack = BlockMachineFrame.getFrameByName("machine", 1); + + OreDictionary.registerOre("itemRubber", ItemParts.getPartByName("rubber")); } public static void registerItem(Item item, String name){ diff --git a/src/main/java/techreborn/init/ModRecipes.java b/src/main/java/techreborn/init/ModRecipes.java index e9534adaa..63c77ae6c 100644 --- a/src/main/java/techreborn/init/ModRecipes.java +++ b/src/main/java/techreborn/init/ModRecipes.java @@ -946,6 +946,14 @@ public class ModRecipes CraftingHelper.addShapedOreRecipe(new ItemStack(ModItems.advancedJackhammer), "ODO", "AOA", 'O', ItemUpgrades.getUpgradeByName("Overclock"), 'D', diamondJackhammerStack, 'A', "circuitAdvanced"); + CraftingHelper + .addShapedOreRecipe(ItemParts.getPartByName("dataControlCircuit"), "ADA", "DID", "ADA", 'I', "ingotIridium", + 'A', ItemParts.getPartByName("advancedCircuit"), 'D', ItemParts.getPartByName("dataStorageCircuit")); + + CraftingHelper + .addShapedOreRecipe(ItemParts.getPartByName("dataOrb"), "DDD", "DSD", "DDD", + 'D', ItemParts.getPartByName("dataStorageCircuit"), 'S', ItemParts.getPartByName("dataStorageCircuit")); + Core.logHelper.info("Shapped Recipes Added"); } diff --git a/src/main/java/techreborn/world/TechRebornWorldGen.java b/src/main/java/techreborn/world/TechRebornWorldGen.java index a32255621..1ef74043f 100644 --- a/src/main/java/techreborn/world/TechRebornWorldGen.java +++ b/src/main/java/techreborn/world/TechRebornWorldGen.java @@ -18,6 +18,7 @@ import net.minecraftforge.fml.common.IWorldGenerator; import org.hjson.JsonValue; import org.hjson.Stringify; import reborncore.common.misc.ChunkCoord; +import reborncore.common.util.ArrayUtils; import techreborn.Core; import techreborn.init.ModBlocks; import techreborn.world.config.OreConfig; @@ -146,6 +147,21 @@ public class TechRebornWorldGen implements IWorldGenerator { }.getType(); config = gson.fromJson(jsonString, typeOfHashMap); + ArrayUtils.addAll(config.endOres, config.neatherOres, config.overworldOres).stream().forEach(oreConfig -> { + if(oreConfig.minYHeight > oreConfig.maxYHeight){ + printError(oreConfig.blockName + " ore generation value is invalid, the min y height is bigger than the max y height, this ore value will be disabled in code"); + + oreConfig.minYHeight = -1; + oreConfig.maxYHeight = -1; + } + + if(oreConfig.minYHeight < 0 || oreConfig.maxYHeight < 0){ + printError(oreConfig.blockName + " ore generation value is invalid, the min y height or the max y height is less than 0, this ore value will be disabled in code"); + oreConfig.minYHeight = -1; + oreConfig.maxYHeight = -1; + } + + }); } catch (Exception e) { Core.logHelper.error( @@ -158,6 +174,14 @@ public class TechRebornWorldGen implements IWorldGenerator } } + public void printError(String string){ + Core.logHelper.error("###############-ERROR-####################"); + Core.logHelper.error(""); + Core.logHelper.error(string); + Core.logHelper.error(""); + Core.logHelper.error("###############-ERROR-####################"); + } + private void save() { Gson gson = new GsonBuilder().setPrettyPrinting().create(); @@ -224,6 +248,9 @@ public class TechRebornWorldGen implements IWorldGenerator for (int i = 0; i < ore.veinsPerChunk; i++) { xPos = chunkX * 16 + random.nextInt(16); + if(ore.maxYHeight == -1 || ore.minYHeight == -1){ + continue; + } yPos = 10 + random.nextInt(ore.maxYHeight - ore.minYHeight); zPos = chunkZ * 16 + random.nextInt(16); BlockPos pos = new BlockPos(xPos, yPos, zPos);