From 248d8e74ef05ac5903d69e96703d98a129a15c6b Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Thu, 21 Nov 2013 23:42:31 +0000 Subject: [PATCH 1/8] Oh here we go again Greggy... Really? FML? Are you high now? :p --- src/tconstruct/util/EnvironmentChecks.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index 0dff1537..26e3e62b 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -31,6 +31,8 @@ public class EnvironmentChecks TConstruct.logger.severe("[Environment Checks] For this reason, the TCon dev team urge you to seek your tedium fix from someone else, as Greg disobeys"); TConstruct.logger.severe("[Environment Checks] the basic tenets of good modders conduct. We log this message rather than sabotage. We'd hope he'd do the same."); TConstruct.logger.severe("[Environment Checks] In the meantime, we recommend not playing anything but IC2 alongside Gregtech. ~ Sunstrike"); + TConstruct.logger.severe("[Environment Checks] GT Appendum I: And now he's going after Forge Mod Loader too..."); + TConstruct.logger.severe("[Environment Checks] http://forum.industrial-craft.net/index.php?page=Thread&postID=138551#post138551 ~ SlimeKnights"); modIds.add("gregtech_addon"); } From 7c76f206650b4297e2e45c6d6ef75d39a4570ca4 Mon Sep 17 00:00:00 2001 From: Sunstrike Date: Fri, 22 Nov 2013 03:44:46 +0000 Subject: [PATCH 2/8] Update EnvironmentChecks.java --- src/tconstruct/util/EnvironmentChecks.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index 26e3e62b..e3579cbd 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -42,11 +42,12 @@ public class EnvironmentChecks modIds.add("optifine"); } - if (Loader.isModLoaded("DragonAPI")) + // Removed for now. Message delivered. + /*if (Loader.isModLoaded("DragonAPI")) { TConstruct.logger.severe("[Environment Checks] DragonAPI detected. Currently this just logs a warning, however if Reika continues his plan to implement DRM-like"); TConstruct.logger.severe("[Environment Checks] code in his mod then it may become marked as fully unsupported. This is just a warning at this stage."); - } + }*/ try { From 4862eb7b53e297859ab4ed66c05f3336d6204c04 Mon Sep 17 00:00:00 2001 From: Reika Date: Fri, 22 Nov 2013 00:49:25 -0500 Subject: [PATCH 3/8] Update EnvironmentChecks.java This code was based on a misunderstanding. --- src/tconstruct/util/EnvironmentChecks.java | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index e3579cbd..073595dc 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -42,13 +42,6 @@ public class EnvironmentChecks modIds.add("optifine"); } - // Removed for now. Message delivered. - /*if (Loader.isModLoaded("DragonAPI")) - { - TConstruct.logger.severe("[Environment Checks] DragonAPI detected. Currently this just logs a warning, however if Reika continues his plan to implement DRM-like"); - TConstruct.logger.severe("[Environment Checks] code in his mod then it may become marked as fully unsupported. This is just a warning at this stage."); - }*/ - try { Class cl = Class.forName("org.bukkit.Bukkit"); From 29354ba3f40d57fd4f2bfd0ec057c576dc8c0941 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Thu, 21 Nov 2013 22:34:47 -0800 Subject: [PATCH 4/8] Gem cast, more misc fixes --- resources/assets/tinker/lang/en_US.lang | 1 + .../textures/items/materials/cast_gem.png | Bin 0 -> 484 bytes src/tconstruct/blocks/BloodBlock.java | 27 +++ .../blocks/logic/SmelteryLogic.java | 30 ++- src/tconstruct/blocks/slime/SlimeGel.java | 2 +- src/tconstruct/client/TClientEvents.java | 213 +++++++++--------- src/tconstruct/client/gui/SmelteryGui.java | 2 +- src/tconstruct/common/TContent.java | 23 +- src/tconstruct/items/ArmorPattern.java | 2 +- src/tconstruct/items/MetalPattern.java | 8 +- src/tconstruct/items/Pattern.java | 9 +- .../library/client/FluidRenderProperties.java | 2 +- src/tconstruct/util/EnvironmentChecks.java | 7 - 13 files changed, 188 insertions(+), 138 deletions(-) create mode 100644 resources/assets/tinker/textures/items/materials/cast_gem.png create mode 100644 src/tconstruct/blocks/BloodBlock.java diff --git a/resources/assets/tinker/lang/en_US.lang b/resources/assets/tinker/lang/en_US.lang index 8a6bac65..10c95c3e 100644 --- a/resources/assets/tinker/lang/en_US.lang +++ b/resources/assets/tinker/lang/en_US.lang @@ -204,6 +204,7 @@ item.tconstruct.MetalPattern.bowstring.name=Bowstring Cast item.tconstruct.MetalPattern.fletching.name=Fletching Cast item.tconstruct.MetalPattern.arrowhead.name=Arrowhead Cast item.tconstruct.MetalPattern.ingot.name=Ingot Cast +item.tconstruct.MetalPattern.gem.name=Gem Cast item.tconstruct.Materials.PaperStack.name=Paper Stack item.tconstruct.Materials.SlimeCrystal.name=Slime Crystal diff --git a/resources/assets/tinker/textures/items/materials/cast_gem.png b/resources/assets/tinker/textures/items/materials/cast_gem.png new file mode 100644 index 0000000000000000000000000000000000000000..5ba859fec36be58d84db8fb1176abea30cb8d716 GIT binary patch literal 484 zcmVPx#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02*{fSaefwW^{L9 za%BKeVQFr3E>1;MAa*k@H7+qRNAp5A0003~NklK z6lvfg3?*EA7)681!lgTRLR%=HZj=HVU62+;Aqay0&NMdDNRX6xk}s1?@_#+&wB`P# zK59t}^f=zDG4$^x!rlbqMhah#`}llFVW=n2xZJ`|oa5-lizcE|4&k*TqI(l2Aqk{7 zo97E33`MXo)ga`|Die(ANwl>f40Q)hnV$&TP)Ub8s9TBP`h1fK`gc*7g@7fQ7Pg_1 zw{jR-c7qAA9_w!7;}pk>#YU|dg-&5HAnFw|pc7X(6Jri6w&s(@l<#km6srs5}i;H`6-goayr zKg=AD+`)pg1M(WlSLo!ogob-1(W0w`P&!>>0{Ua9C*D7i(~HO-daP49T7r7K%mnin a$9)5tVNN}VB^4I{0000 20) - healthMax = 20; - float absorb = this.mc.thePlayer.getAbsorptionAmount(); + ScaledResolution scaledresolution = new ScaledResolution(this.mc.gameSettings, this.mc.displayWidth, this.mc.displayHeight); + int scaledWidth = scaledresolution.getScaledWidth(); + int scaledHeight = scaledresolution.getScaledHeight(); + int xBasePos = scaledWidth / 2 - 91; + int yBasePos = scaledHeight - 39; + TPlayerStats stats = TConstruct.playerTracker.getPlayerStats(mc.thePlayer.username); - int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); - int rowHeight = Math.max(10 - (healthRows - 2), 3); + boolean highlight = mc.thePlayer.hurtResistantTime / 3 % 2 == 1; - this.rand.setSeed((long) (updateCounter * 312871)); - - int left = scaledWidth / 2 - 91; - int top = scaledHeight - left_height; - - int regen = -1; - if (mc.thePlayer.isPotionActive(Potion.regeneration)) - { - regen = updateCounter % 25; - } - - final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); - final int BACKGROUND = (highlight ? 25 : 16); - int MARGIN = 16; - if (mc.thePlayer.isPotionActive(Potion.poison)) - MARGIN += 36; - else if (mc.thePlayer.isPotionActive(Potion.wither)) - MARGIN += 72; - float absorbRemaining = absorb; - - for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) - { - int b0 = (highlight ? 1 : 0); - int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; - int x = left + i % 10 * 8; - int y = top - row * rowHeight; - - if (health <= 4) - y += rand.nextInt(2); - if (i == regen) - y -= 2; - - drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); - - if (highlight) + if (mc.thePlayer.hurtResistantTime < 10) { - if (i * 2 + 1 < healthLast) - drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); //6 - else if (i * 2 + 1 == healthLast) - drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); //7 + highlight = false; } - if (absorbRemaining > 0.0F) + AttributeInstance attrMaxHealth = this.mc.thePlayer.getEntityAttribute(SharedMonsterAttributes.maxHealth); + int health = MathHelper.ceiling_float_int(mc.thePlayer.getHealth()); + int healthLast = MathHelper.ceiling_float_int(mc.thePlayer.prevHealth); + float healthMax = (float) attrMaxHealth.getAttributeValue(); + if (healthMax > 20) + healthMax = 20; + float absorb = this.mc.thePlayer.getAbsorptionAmount(); + + int healthRows = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F / 10.0F); + int rowHeight = Math.max(10 - (healthRows - 2), 3); + + this.rand.setSeed((long) (updateCounter * 312871)); + + int left = scaledWidth / 2 - 91; + int top = scaledHeight - left_height; + + int regen = -1; + if (mc.thePlayer.isPotionActive(Potion.regeneration)) { - if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) - drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17 + regen = updateCounter % 25; + } + + final int TOP = 9 * (mc.theWorld.getWorldInfo().isHardcoreModeEnabled() ? 5 : 0); + final int BACKGROUND = (highlight ? 25 : 16); + int MARGIN = 16; + if (mc.thePlayer.isPotionActive(Potion.poison)) + MARGIN += 36; + else if (mc.thePlayer.isPotionActive(Potion.wither)) + MARGIN += 72; + float absorbRemaining = absorb; + + for (int i = MathHelper.ceiling_float_int((healthMax + absorb) / 2.0F) - 1; i >= 0; --i) + { + int b0 = (highlight ? 1 : 0); + int row = MathHelper.ceiling_float_int((float) (i + 1) / 10.0F) - 1; + int x = left + i % 10 * 8; + int y = top - row * rowHeight; + + if (health <= 4) + y += rand.nextInt(2); + if (i == regen) + y -= 2; + + drawTexturedModalRect(x, y, BACKGROUND, TOP, 9, 9); + + if (highlight) + { + if (i * 2 + 1 < healthLast) + drawTexturedModalRect(x, y, MARGIN + 54, TOP, 9, 9); //6 + else if (i * 2 + 1 == healthLast) + drawTexturedModalRect(x, y, MARGIN + 63, TOP, 9, 9); //7 + } + + if (absorbRemaining > 0.0F) + { + if (absorbRemaining == absorb && absorb % 2.0F == 1.0F) + drawTexturedModalRect(x, y, MARGIN + 153, TOP, 9, 9); //17 + else + drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16 + absorbRemaining -= 2.0F; + } else - drawTexturedModalRect(x, y, MARGIN + 144, TOP, 9, 9); //16 - absorbRemaining -= 2.0F; + { + if (i * 2 + 1 < health) + drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); //4 + else if (i * 2 + 1 == health) + drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); //5 + } } - else + + PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); + if (potion != null) + return; + potion = mc.thePlayer.getActivePotionEffect(Potion.poison); + if (potion != null) + return; + + //Extra hearts + this.mc.getTextureManager().bindTexture(hearts); + + int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); + for (int iter = 0; iter < hp / 20; iter++) { - if (i * 2 + 1 < health) - drawTexturedModalRect(x, y, MARGIN + 36, TOP, 9, 9); //4 - else if (i * 2 + 1 == health) - drawTexturedModalRect(x, y, MARGIN + 45, TOP, 9, 9); //5 + int renderHearts = (hp - 20 * (iter + 1)) / 2; + if (renderHearts > 10) + renderHearts = 10; + for (int i = 0; i < renderHearts; i++) + { + this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos, 0 + 18 * iter, 0, 8, 8); + } + if (hp % 2 == 1 && renderHearts < 10) + { + this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, 0, 8, 8); + } } - } - PotionEffect potion = mc.thePlayer.getActivePotionEffect(Potion.wither); - if (potion != null) - return; - potion = mc.thePlayer.getActivePotionEffect(Potion.poison); - if (potion != null) - return; - - //Extra hearts - this.mc.getTextureManager().bindTexture(hearts); - - int hp = MathHelper.ceiling_float_int(this.mc.thePlayer.getHealth()); - for (int iter = 0; iter < hp / 20; iter++) - { - int renderHearts = (hp - 20 * (iter + 1)) / 2; - if (renderHearts > 10) - renderHearts = 10; - for (int i = 0; i < renderHearts; i++) - { - this.drawTexturedModalRect(xBasePos + 8 * i, yBasePos, 0 + 18 * iter, 0, 8, 8); - } - if (hp % 2 == 1 && renderHearts < 10) - { - this.drawTexturedModalRect(xBasePos + 8 * renderHearts, yBasePos, 9 + 18 * iter, 0, 8, 8); - } - } - - this.mc.getTextureManager().bindTexture(icons); - GuiIngameForge.left_height += 10; - if (absorb > 0) + this.mc.getTextureManager().bindTexture(icons); GuiIngameForge.left_height += 10; + if (absorb > 0) + GuiIngameForge.left_height += 10; + + event.setCanceled(true); + } } } diff --git a/src/tconstruct/client/gui/SmelteryGui.java b/src/tconstruct/client/gui/SmelteryGui.java index 34ad2896..9b491384 100644 --- a/src/tconstruct/client/gui/SmelteryGui.java +++ b/src/tconstruct/client/gui/SmelteryGui.java @@ -281,7 +281,7 @@ public class SmelteryGui extends NewContainerGui list.add("\u00A7f" + name); if (name.equals("Liquified Emerald")) { - list.add("Emeralds: " + liquid.amount / 320f); + list.add("Emeralds: " + liquid.amount / 640f); } else if (name.equals("Molten Glass")) { diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 9d9cae60..00f2ce1b 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -613,7 +613,7 @@ public class TContent implements IFuelHandler bloodFluid = new Fluid("blood"); if (!FluidRegistry.registerFluid(bloodFluid)) bloodFluid = FluidRegistry.getFluid("blood"); - blood = new TConstructFluid(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); + blood = new BloodBlock(PHConstruct.blood, bloodFluid, Material.water, "liquid_cow").setUnlocalizedName("liquid.blood"); GameRegistry.registerBlock(blood, "liquid.blood"); fluids[16] = bloodFluid; fluidBlocks[16] = blood; @@ -813,9 +813,9 @@ public class TContent implements IFuelHandler materials = new MaterialItem(PHConstruct.materials).setUnlocalizedName("tconstruct.Materials"); toolRod = new ToolPart(PHConstruct.toolRod, "_rod", "ToolRod").setUnlocalizedName("tconstruct.ToolRod"); toolShard = new ToolShard(PHConstruct.toolShard, "_chunk").setUnlocalizedName("tconstruct.ToolShard"); - woodPattern = new Pattern(PHConstruct.woodPattern, "WoodPattern", "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); - metalPattern = new MetalPattern(PHConstruct.metalPattern, "MetalPattern", "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); - armorPattern = new ArmorPattern(PHConstruct.armorPattern, "ArmorPattern", "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); + woodPattern = new Pattern(PHConstruct.woodPattern, "pattern_", "materials/").setUnlocalizedName("tconstruct.Pattern"); + metalPattern = new MetalPattern(PHConstruct.metalPattern, "cast_", "materials/").setUnlocalizedName("tconstruct.MetalPattern"); + armorPattern = new ArmorPattern(PHConstruct.armorPattern, "armorcast_", "materials/").setUnlocalizedName("tconstruct.ArmorPattern"); TConstructRegistry.addItemToDirectory("blankPattern", blankPattern); TConstructRegistry.addItemToDirectory("woodPattern", woodPattern); @@ -996,7 +996,7 @@ public class TContent implements IFuelHandler TConstructRegistry.addToolMaterial(15, "Alumite", 4, 550, 800, 3, 1.3F, 2, 0f, "\u00A7d", ""); TConstructRegistry.addToolMaterial(16, "Steel", 4, 750, 800, 3, 1.3F, 2, 0f, "", ""); TConstructRegistry.addToolMaterial(17, "BlueSlime", "Slime ", 0, 1200, 150, 0, 2.0F, 0, 0f, "\u00A7b", ""); - TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 150, 600, 2, 1.1F, 1, 0f, "\u00A7c", "Tasty"); + TConstructRegistry.addToolMaterial(18, "PigIron", "Pig Iron ", 3, 250, 600, 2, 1.3F, 1, 0f, "\u00A7c", "Tasty"); TConstructRegistry.addBowMaterial(0, 384, 20, 1.0f); //Wood TConstructRegistry.addBowMaterial(1, 10, 80, 0.2f); //Stone @@ -1343,7 +1343,6 @@ public class TContent implements IFuelHandler GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc), new ItemStack(woolSlab1, 1, sc), new ItemStack(woolSlab1, 1, sc)); GameRegistry.addShapelessRecipe(new ItemStack(Block.cloth, 1, sc + 8), new ItemStack(woolSlab2, 1, sc), new ItemStack(woolSlab2, 1, sc)); } - GameRegistry.addRecipe(new ItemStack(woolSlab1, 6, 0), "www", 'w', new ItemStack(Block.cloth, 1, Short.MAX_VALUE)); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Block.cloth, 1, 0), "slabCloth", "slabCloth")); //Trap Recipes GameRegistry.addRecipe(new ItemStack(punji, 5, 0), "b b", " b ", "b b", 'b', new ItemStack(Item.reed)); @@ -1415,7 +1414,7 @@ public class TContent implements IFuelHandler { /* Tools */ patternOutputs = new Item[] { toolRod, pickaxeHead, shovelHead, hatchetHead, swordBlade, wideGuard, handGuard, crossbar, binding, frypanHead, signHead, knifeBlade, chiselHead, toughRod, - toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead }; + toughBinding, largePlate, broadAxeHead, scytheBlade, excavatorHead, largeSwordBlade, hammerHead, fullGuard, null, null, arrowhead, null }; int[] nonMetals = { 0, 1, 3, 4, 5, 6, 7, 8, 9, 17 }; @@ -1543,13 +1542,19 @@ public class TContent implements IFuelHandler { /* Smeltery */ ItemStack ingotcast = new ItemStack(metalPattern, 1, 0); + ItemStack gemcast = new ItemStack(metalPattern, 1, 26); LiquidCasting tableCasting = TConstructRegistry.instance.getTableCasting(); //Blank tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 1), new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), 80); tableCasting.addCastingRecipe(new ItemStack(blankPattern, 1, 2), new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenAlubrassFluid, TConstruct.ingotLiquidValue), new ItemStack(Item.emerald), 80); + tableCasting.addCastingRecipe(gemcast, new FluidStack(moltenGoldFluid, TConstruct.ingotLiquidValue * 2), new ItemStack(Item.emerald), 80); //Ingots tableCasting.addCastingRecipe(new ItemStack(materials, 1, 2), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), ingotcast, 80); //stone + + //Gems + tableCasting.addCastingRecipe(new ItemStack(Item.emerald), new FluidStack(moltenEmeraldFluid, 640), gemcast, 80); //Buckets ItemStack bucket = new ItemStack(Item.bucketEmpty); @@ -1669,7 +1674,7 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), - new FluidStack(bloodFluid, 400)); //Pigiron + new FluidStack(moltenEmeraldFluid, 160), new FluidStack(bloodFluid, 80)); //Pigiron // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) @@ -1976,6 +1981,8 @@ public class TContent implements IFuelHandler ensureOreIsRegistered("crafterWood", new ItemStack(Block.workbench, 1)); + OreDictionary.registerOre("torchStone", new ItemStack(stoneTorch)); + String[] matNames = { "wood", "stone", "iron", "flint", "cactus", "bone", "obsidian", "netherrack", "slime", "paper", "cobalt", "ardite", "manyullyn", "copper", "bronze", "alumite", "steel", "blueslime" }; for (int i = 0; i < matNames.length; i++) diff --git a/src/tconstruct/items/ArmorPattern.java b/src/tconstruct/items/ArmorPattern.java index a20ee08f..fd1d8866 100644 --- a/src/tconstruct/items/ArmorPattern.java +++ b/src/tconstruct/items/ArmorPattern.java @@ -16,7 +16,7 @@ public class ArmorPattern extends CraftingItem implements ItemBlocklike private Icon baseIcon; - public ArmorPattern(int id, String partType, String patternType, String folder) + public ArmorPattern(int id, String patternType, String folder) { super(id, patternName, getPatternNames(patternType), folder); this.setHasSubtypes(true); diff --git a/src/tconstruct/items/MetalPattern.java b/src/tconstruct/items/MetalPattern.java index c65fcfff..6d6a6a49 100644 --- a/src/tconstruct/items/MetalPattern.java +++ b/src/tconstruct/items/MetalPattern.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; public class MetalPattern extends Pattern { - public MetalPattern(int id, String partType, String patternType, String folder) + public MetalPattern(int id, String patternType, String folder) { - super(id, partType, patternType, folder); + super(id, patternName, getPatternNames(patternType), folder); } protected static String[] getPatternNames (String partType) @@ -19,11 +19,13 @@ public class MetalPattern extends Pattern for (int i = 0; i < patternName.length; i++) if (!(patternName[i].equals(""))) names[i] = partType + patternName[i]; + else + names[i] = ""; return names; } private static final String[] patternName = new String[] { "ingot", "rod", "pickaxe", "shovel", "axe", "swordblade", "largeguard", "mediumguard", "crossbar", "binding", "frypan", "sign", - "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead" }; + "knifeblade", "chisel", "largerod", "toughbinding", "largeplate", "broadaxe", "scythe", "excavator", "largeblade", "hammerhead", "fullguard", "", "", "arrowhead", "gem" }; public void getSubItems (int id, CreativeTabs tab, List list) { diff --git a/src/tconstruct/items/Pattern.java b/src/tconstruct/items/Pattern.java index 21bf795d..62bb2fc6 100644 --- a/src/tconstruct/items/Pattern.java +++ b/src/tconstruct/items/Pattern.java @@ -11,9 +11,14 @@ import tconstruct.library.util.IPattern; public class Pattern extends CraftingItem implements IPattern { - public Pattern(int id, String partType, String patternType, String folder) + public Pattern(int id, String patternType, String folder) { - super(id, patternName, getPatternNames(patternType), folder); + this(id, patternName, getPatternNames(patternType), folder); + } + + public Pattern(int id, String[] names, String[] patternTypes, String folder) + { + super(id, names, patternTypes, folder); this.setHasSubtypes(true); this.setMaxDamage(0); this.setContainerItem(this); diff --git a/src/tconstruct/library/client/FluidRenderProperties.java b/src/tconstruct/library/client/FluidRenderProperties.java index 58df82e0..5794e70e 100644 --- a/src/tconstruct/library/client/FluidRenderProperties.java +++ b/src/tconstruct/library/client/FluidRenderProperties.java @@ -46,7 +46,7 @@ public class FluidRenderProperties public static enum Applications { - TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.0625F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); + TABLE(0.9375F, 1F, 0.0625F, 0.9375F, 0.062F, 0.9375F), BASIN(0.25F, 0.95F, 0.0625F, 0.9375F, 0.0625F, 0.9375F); public float minHeight, maxHeight, minX, maxX, minZ, maxZ; diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index e3579cbd..073595dc 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -42,13 +42,6 @@ public class EnvironmentChecks modIds.add("optifine"); } - // Removed for now. Message delivered. - /*if (Loader.isModLoaded("DragonAPI")) - { - TConstruct.logger.severe("[Environment Checks] DragonAPI detected. Currently this just logs a warning, however if Reika continues his plan to implement DRM-like"); - TConstruct.logger.severe("[Environment Checks] code in his mod then it may become marked as fully unsupported. This is just a warning at this stage."); - }*/ - try { Class cl = Class.forName("org.bukkit.Bukkit"); From 7816e6788306e3d5bbb67bd8f33006411ae42737 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Thu, 21 Nov 2013 23:19:34 -0800 Subject: [PATCH 5/8] Melt and cast emerald blocks --- src/tconstruct/common/TContent.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 00f2ce1b..94ab1e2b 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1643,7 +1643,7 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 800*9), new ItemStack(Block.cobblestone), true, 100); //emerald basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender @@ -1715,6 +1715,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.doorIron), 0, TConstruct.ingotLiquidValue * 6); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.cauldron), 0, TConstruct.ingotLiquidValue * 7); Smeltery.addMelting(FluidType.Iron, new ItemStack(Item.shears), 0, TConstruct.ingotLiquidValue * 2); + Smeltery.addMelting(FluidType.Emerald, new ItemStack(Item.emerald), -50, 800); //Blocks melt as themselves! //Ore @@ -1735,6 +1736,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); + Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 800*9)); Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); From 9ecd8041d5197f913c78d3f601bc804f2264b981 Mon Sep 17 00:00:00 2001 From: mDiyo Date: Fri, 22 Nov 2013 00:07:33 -0800 Subject: [PATCH 6/8] Fix emerald casting --- src/tconstruct/common/TContent.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/tconstruct/common/TContent.java b/src/tconstruct/common/TContent.java index 94ab1e2b..ca2cc868 100644 --- a/src/tconstruct/common/TContent.java +++ b/src/tconstruct/common/TContent.java @@ -1643,7 +1643,7 @@ public class TContent implements IFuelHandler basinCasting.addCastingRecipe(new ItemStack(clearGlass, 1, 0), new FluidStack(moltenGlassFluid, FluidContainerRegistry.BUCKET_VOLUME), null, true, 100); //glass basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 4), new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue), null, true, 100); //seared stone basinCasting.addCastingRecipe(new ItemStack(smeltery, 1, 5), new FluidStack(moltenStoneFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.cobblestone), true, 100); - basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 800*9), new ItemStack(Block.cobblestone), true, 100); //emerald + basinCasting.addCastingRecipe(new ItemStack(Block.blockEmerald), new FluidStack(moltenEmeraldFluid, 640*9), null, true, 100); //emerald basinCasting.addCastingRecipe(new ItemStack(speedBlock, 1, 0), new FluidStack(moltenTinFluid, TConstruct.nuggetLiquidValue), new ItemStack(Block.gravel), true, 100); //brownstone basinCasting.addCastingRecipe(new ItemStack(Block.whiteStone), new FluidStack(moltenEnderFluid, TConstruct.chunkLiquidValue), new ItemStack(Block.obsidian), true, 100); //endstone basinCasting.addCastingRecipe(new ItemStack(metalBlock.blockID, 1, 10), new FluidStack(moltenEnderFluid, 1000), null, true, 100); //ender @@ -1674,7 +1674,7 @@ public class TContent implements IFuelHandler Smeltery.addAlloyMixing(new FluidStack(moltenManyullynFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsManyullynAlloy), new FluidStack(moltenCobaltFluid, TConstruct.ingotLiquidValue), new FluidStack(moltenArditeFluid, TConstruct.ingotLiquidValue)); //Manyullyn Smeltery.addAlloyMixing(new FluidStack(pigIronFluid, TConstruct.ingotLiquidValue * PHConstruct.ingotsPigironAlloy), new FluidStack(moltenIronFluid, TConstruct.ingotLiquidValue), - new FluidStack(moltenEmeraldFluid, 160), new FluidStack(bloodFluid, 80)); //Pigiron + new FluidStack(moltenEmeraldFluid, 640), new FluidStack(bloodFluid, 80)); //Pigiron // Stone parts for (int sc = 0; sc < patternOutputs.length; sc++) @@ -1736,7 +1736,7 @@ public class TContent implements IFuelHandler Smeltery.addMelting(Block.thinGlass, 0, 625, new FluidStack(moltenGlassFluid, 250)); Smeltery.addMelting(Block.stone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); Smeltery.addMelting(Block.cobblestone, 0, 800, new FluidStack(moltenStoneFluid, TConstruct.ingotLiquidValue / 18)); - Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 800*9)); + Smeltery.addMelting(Block.blockEmerald, 0, 800, new FluidStack(moltenEmeraldFluid, 640*9)); Smeltery.addMelting(clearGlass, 0, 500, new FluidStack(moltenGlassFluid, 1000)); Smeltery.addMelting(glassPane, 0, 350, new FluidStack(moltenGlassFluid, 250)); From 3041f4322387ccdd291bc41e5a0223ee807f3aad Mon Sep 17 00:00:00 2001 From: mDiyo Date: Fri, 22 Nov 2013 13:46:43 -0800 Subject: [PATCH 7/8] Fix Smeltery causing massive updates --- .../textures/blocks/compressed_alubrass.png | Bin 232 -> 1189 bytes .../textures/blocks/compressed_alumite.png | Bin 423 -> 1189 bytes .../textures/blocks/compressed_ardite.png | Bin 362 -> 1189 bytes .../textures/blocks/compressed_cobalt.png | Bin 460 -> 1189 bytes .../textures/blocks/compressed_ender.png | Bin 570 -> 933 bytes .../textures/blocks/compressed_manyullyn.png | Bin 443 -> 1207 bytes src/tconstruct/blocks/logic/SmelteryLogic.java | 4 ++-- 7 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/assets/tinker/textures/blocks/compressed_alubrass.png b/resources/assets/tinker/textures/blocks/compressed_alubrass.png index 9f76af182a80d8b21a2a9295fd3778d3b57ec3ab..90f0329e0ed6645671d85b603eabbd18c6553b2b 100644 GIT binary patch literal 1189 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`oCO|{#S9GG!XV7ZFl&wkP>{XE z)7O>#F1H9f8{@mPS7m`hvY8S|xv6<2KrRD=b5UwyNotBhd1gt5g1e`0K#E=} zI|BoYw5N+>h=m}d0L%N|j2C8W{RgWigLv`w8v_eSpJres!>cPR8F)pcQH6+-N8RVcQ!9 zkVbR>4kab?R0dGMfE0uL2E!on+mAkiH6m*^jjROvACfx3u>dobhnoxTG>{lf5id6@ pObM8ViGw&S$Q)3pVgtx((B-*QkNB5LiW!5%Jzf1=);T3K0RRW^<>UYW delta 204 zcmV;-05kuk3FrZkB!90-L_t(|+GDsdTkAi$ct?lAe+Cfa!`-z>(8(KWp| zn*_&r4Zx-8@c|z=#%Tb$#%G7UQ8dEv>RM?`1CTXh(*(mHeJBQ?+xl?7Kk)|O@*^^S zw9gNYuWz+O7yt?gVl=@t!Z2O~aA`uuMfrn&4~z0000P2_+Y-Nd^${{`dG zGj|WhL{A({OuTr|1&wh5%>vtQX*+GlH`8swU$2>YGw;3cd#`V1o-QrUS;gTZ0IN1X zbCYyMjzXU1aa*jAI`v@w_9LKlMh=E&&(D(4Y}6KJ&CjK3{=&$mxpS|{G`hBYt1*3l zeZ79KL0e$@VSS}hU!8co*0?({S6f(GovNFFK2n>xzI>&hRrGz%#H*%I(f^wQ_t+Ch zK>T~SuDrY7A$$%tHhvu3vq=Lp4Pa#95mTvDEPbi)tzAUJqeRdX2~q$d zC?gqpkh+wP5yB;#-*rGosl;=-(1V>lu)GQGc6;W3tG3gjVndjA0Olo?v^#C+K0ku( zv~jxJ_ZL!Tl;ZgwjFtnvph0x0$$E~g8Y(3V8sB%J)A;u0oeEAT&N&P)gbXUPw9Cv| zE(h1P5!(*D?H@!_)D^2WIGB-i!T?81;Gk=RZT(bbr^L3CfYZGWH&m=~6v3(vC=y8~ zGo3hH75^vLEgKYh$>x2M*E{#lAFJp)I*x6soX_oz`0hhL_Dqk;WH zXjT!2tyb3U3@q7l)RYrikJ=ptWC0Nc3A<*{r63XsOhvQG>9VJjqttUleX!`_#N2~0 y1$8yKTd_`Wq(rZfL>`@>qw{Gm0*a$V%=eYA*}C{*<67mV+|*_lXEtu!dGZU7EmBkf delta 398 zcmV;90dfAN38w>)BYy#INklT)#_--|IHGzf$rn@mlCuL~R+irs*Gu#quPQdHydOo1^b{^Iqm?}G`CP7ts|D&u_X%Dx zi5;o{*XRMGCx7fMXXt(@ZII#$jhG~Bs)Gwm;4xZO=C!;VAWaK#>dtRzRDhg7j~TLj zL8jSR-1eCP8i<#~vA!a6!4{G-V_2sY05l9k(WFo;SCagOHR{y#po8rr#)Q6juJ5&%KlW`=}0kZm%K4p`c zeJ7QvF_y%raCp@e`b4dNdDd3z}qUYH?LFp zKef$n2i|;?zgjHe%SG9uxoZ#b;5l$;AbJNR6O_eaK(YbJrU1zX)?I1A*`$TG{4e!L e34?#P4Mi(4E5B4dJ-={do@;M-tT=b4?!~}r{h5yrc^aKndeE4}M9}RHg&n4^)Nl}z&%(F&-++oha7V05s3ij}b{Kn+>%qhlBFP?VpV zic=e{45n2{E{K!7%@I5`S;)cBVMV3nB1 iGV%R>0L@BgH}DJiv_&{HuReMJ0000fgc5PfSlj*}>)QTP(5q~gS-J*OuGP1RZ=QH6>GH!3v}Jroc`;?9k~fO_eH zD}R8W0fHVtB0=hBz;+YGA$DzMHr*tIa$}_Z@Oa+NytlKjSE@_d^wl(gti4>mN9z<1 z%cQy3j@M{OJzIYG0>~722)x<4Le6B}t}G_MW-geeOto0C$u+&P`k=n>baS)zq)wl} z!t>f%y|zB{a-;ruX34Istk2bwfV^gxZ?Bf}VoExJxVv>6Hx5q}U~+Q35T!Y5==S}1 zxYrxmJc^J?2<){27)c4UvyYI*Q71-zdRE0Xb_WT1;Q(d`z&r==xAf>#=T`_TXd!C5 z2*aKN>kOP#1KDRu;GjLKM9S6bOQyXZ3>tIHY815SUBtc8E8D z%$}>LvW_gUHrYIkknkEnOh{oMlzB*h7Y6BKOayC?URfh~{gMIKDrz56YIk1E+z0lp zQ6K1PhrzUw-@f<9zg4;89Qmi#h-r37igW_QRf(uikj}@yu2X0I(H-&TL;BqioLVwy zToip6ugvlDrvh@9FGBnzoyY>xC=oiKH-Qu1`OkfzuaYxquDoY4$4ytwZ)MmA%u$QO z!J6Y)z(0K42lBM@{DTJQp($=g_J-oh!OZn6omivvPGNTY{k*zsd$C%6cjwWo-}h59 A`2YX_ delta 435 zcmV;k0Zjg-3CshKBYy#tNklSps8&T*Lq(&=u>py@z9DarNf+DA;*A z&;=j@Ss}7!5C$n!ZiLYCb*R{SGSC3qDIYORM%D~cC|COqPJbg~kQ%T7=(d3{vQ1zO z74QDbmcRZlU;Ge^Rg12J`3xWhD)|@wtK^*n(=bWZf{PFuiecg)b;?=C|0|~L2h$8v zC9nPqr(OOpo_!09MKZ60`NApZ{tG6b1!IB4lVCnb9K_~}J@TI?YTtj5UIvk@TVM&e zMkoepgehe6TYvkX&1V?`do2djATeG?q84rAVHq6ZU4D~)?>Am$z>Lt zh8O_!J4hqg$v};40UNMt#D>8JfNce81o;(gE64z-vn=5lIRKFY5^Mn8sDs7`a@4^s d0$Kv%0{{>?UQpM-S-SuL002ovPDHLkV1kKFygL8@ diff --git a/resources/assets/tinker/textures/blocks/compressed_ender.png b/resources/assets/tinker/textures/blocks/compressed_ender.png index b7e9bbbc9380acb18444f220b7ef26366e8ac197..ac36a3f04786e6bace5cc17c9ec410294303b704 100644 GIT binary patch literal 933 zcmb7Cy)Q#i6hBX2luAQ<)o1czVek=#GFWJ7-_S;+5=Vr-aGeq&*#18+|7|>EEs4A5K+*MM@O+%@Ly5{xxF(R z#!|WzpI9L(tK#3Fz5O~U{f?a&^52$K7n{A68}V+an&(pEPGoU@KC|FpOB7koOgovh zwL0g_S}{8@lJ3m-iF}QAbRgAMV^sKFzYRLvRnC7ECfz@2U)N<)Tgy_ow`G-r>lPJk z(7+q6;vMeL!B&XyxY$78C-8EeX4L`E8M&62aXH)-=N3Jb(pKpE z!UjzxbQ&)o_9!A-#PE$36jv3b$I^9}r13BdBqkqe>WO&XaFWJrceTif6g71|%t%HC yB9L?I4NrjY>AEJ5Q;@yX)#NRCu0rz4|2%K?G*V;ER{hy^iqqIb$>_o0)cOx9HI>1n|M=QO9Yz6VVqaz1^$qcd$1TGA3 z^&I_GhA}WsVQ>z{f@(#7-&`BQW&x0GAm6}hEy&4(y0I*{U#cK`hAb7p@&N|#0kFif zhQ}uu&!OLi`vqM87V~lmfe+J#NPG{XuJ)ybm4WL-heK3Ut$@iTV>&D3n%eh!V%|-o^q_p$U~M5cDlG3o(aq>qIS~aw>p+6pYK-|thmH+{SP~pt@t?H^ z82*BMt>R)tBscKobCKy37pN|<`0N1S>I$kg_%Hy^RYJc9@i~0|v6mMF<@iV@h4}Oi z;vU2f%x4fq5H{6o#bhRqPNG>i6 diff --git a/resources/assets/tinker/textures/blocks/compressed_manyullyn.png b/resources/assets/tinker/textures/blocks/compressed_manyullyn.png index 7722c8d90c6b8bee377b1bd824850adbaaade533..5f54d305f3a9f7f72a013f39ddb1699d362b438a 100644 GIT binary patch literal 1207 zcmZ`&OK1~O6g~6FOwvixG#}HZR;!{e{NWEo5d2hX5Jkj=?o=%3qAD72t+;XJ!kxNs zrz_VA3L@yjwIW5U6-m=3HZ{#}-kYEI&2(a2c!&3yd(XZ1-Sh6dck1MLqOZ^gAW=Lv zcAD0d7*UPpwN38=E!xH7<74o|_vH1{2c(HzKX&dWU}VIQ@bK{2GiOUju1!u(TrJTraOB3sh0?^O(OXwamq*8oCr(}3KA{8ZaB=L=nSBFN zN?o+1SNAKPkN(f(ao)4I7T|gR!c}2ym6u?1IYs!(R=p zA2XE(hK7caiw}b{n>gXbjVU-V;Z`G13*+l6P$+qe%iX;=}VxDQwK(KVUhD?7Jv$dZ-xR4w1_i1fa7?UarN>bbH7G%Q&r-#HHx=RvGrs7CM zpim+!_Cgnut){6?#^Tfm9-_npTYj#rVPjAWUSq4#MM}x{NEL}ZJ4kkS@2-2v1GjgJ Opv9vn$DSWPf9DVH99t;> delta 418 zcmV;T0bTyL3A+Q3BYy#cNklHgHbkiP|K~picSl z3mt@NOfG!Sxj;jD!l2B!!BM`p zl;}5@n5V)y>VG&V25x9Ga7ECHbfC&Fq)@`*cH^q|gqA%8MYJ8!BXVOkc9lQ`wudco ze5k|*5H0rX(?a*2f(@{NTyvxE+GeDSqrC;27+`?N2A|Y@VZc-UWm@wUU8l}>?W)KI zxI2VcnT1|=p&M)fF@#tbQ(>Ui);^dM)U7LY_;vD+=o`OI4#E)RzrJg!7)cQOUjP6A M07*qoM6N<$g7mM)Q2+n{ diff --git a/src/tconstruct/blocks/logic/SmelteryLogic.java b/src/tconstruct/blocks/logic/SmelteryLogic.java index b37651d9..72284e2a 100644 --- a/src/tconstruct/blocks/logic/SmelteryLogic.java +++ b/src/tconstruct/blocks/logic/SmelteryLogic.java @@ -964,7 +964,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci } else { - if (doDrain) + if (doDrain && maxDrain > 0) { liquid.amount -= maxDrain; worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); @@ -989,7 +989,7 @@ public class SmelteryLogic extends InventoryLogic implements IActiveLogic, IFaci resource.amount = maxLiquid - currentLiquid; int amount = resource.amount; - if (doFill) + if (amount > 0 && doFill) { if (addMoltenMetal(resource, false)) { From 26ce581662dfc95545805d2d267addf231a71dcc Mon Sep 17 00:00:00 2001 From: mDiyo Date: Fri, 22 Nov 2013 19:22:17 -0800 Subject: [PATCH 8/8] Add a note to Environment Checks --- src/tconstruct/util/EnvironmentChecks.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/tconstruct/util/EnvironmentChecks.java b/src/tconstruct/util/EnvironmentChecks.java index 073595dc..c401dcc0 100644 --- a/src/tconstruct/util/EnvironmentChecks.java +++ b/src/tconstruct/util/EnvironmentChecks.java @@ -19,6 +19,7 @@ public class EnvironmentChecks /** * Checks for conflicting stuff in environment; adds callable to any crash logs if so. + * Note: This code adds additional data to crashlogs. It does not trigger any crashes. */ public static void verifyEnvironmentSanity () {