From 6d8abce42792eba7385f0f2e4e2356735761c635 Mon Sep 17 00:00:00 2001 From: Blood-Asp Date: Mon, 12 Oct 2015 01:23:48 +0200 Subject: first half of 5.08.31 --- .../api/metatileentity/BaseMetaTileEntity.java | 5 +- main/java/gregtech/api/util/GT_ModHandler.java | 5 +- .../multi/GT_MetaTileEntity_ProcessingArray.java | 12 ++-- .../gregtech/loaders/misc/GT_Achievements.java | 10 +-- .../loaders/postload/GT_CraftingRecipeLoader.java | 4 +- .../loaders/postload/GT_MachineRecipeLoader.java | 15 ++++- .../preload/GT_Loader_Item_Block_And_Fluid.java | 72 ++++++++++------------ main/resources/assets/gregtech/lang/en_US.lang | 6 +- main/resources/assets/gregtech/lang/zh_CN.lang | 4 +- 9 files changed, 72 insertions(+), 61 deletions(-) diff --git a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java index ce5b3c629e..9870ba9bec 100644 --- a/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java +++ b/main/java/gregtech/api/metatileentity/BaseMetaTileEntity.java @@ -388,8 +388,9 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE || (getCoverIDAtSide((byte)4) == 0 && worldObj.getPrecipitationHeight(xCoord-1, zCoord ) - 1 < yCoord) || (getCoverIDAtSide((byte)5) == 0 && worldObj.getPrecipitationHeight(xCoord+1, zCoord ) - 1 < yCoord)) { if (GregTech_API.sMachineRainExplosions && worldObj.isRaining() && getBiome().rainfall > 0) { - if (getRandomNumber(10)==0) {doEnergyExplosion(); + if (getRandomNumber(10)==0) { try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){} + doEnergyExplosion(); }else setOnFire(); } if (!hasValidMetaTileEntity()) { @@ -397,8 +398,8 @@ public class BaseMetaTileEntity extends BaseTileEntity implements IGregTechTileE return; } if (GregTech_API.sMachineThunderExplosions && worldObj.isThundering() && getBiome().rainfall > 0 && getRandomNumber(3) == 0) { - doEnergyExplosion(); try{GT_Mod.instance.achievements.issueAchievement(this.getWorldObj().getPlayerEntityByName(mOwnerName), "badweather");}catch(Exception e){} + doEnergyExplosion(); } } } diff --git a/main/java/gregtech/api/util/GT_ModHandler.java b/main/java/gregtech/api/util/GT_ModHandler.java index 22759cd057..b657c8ee3f 100644 --- a/main/java/gregtech/api/util/GT_ModHandler.java +++ b/main/java/gregtech/api/util/GT_ModHandler.java @@ -1503,7 +1503,10 @@ public class GT_ModHandler { if(isElectricItem(aStack)&&ic2.api.item.ElectricItem.manager.getCharge(aStack)>1000.0d){ for (int i = 0; i < tPlayer.inventory.mainInventory.length; i++) { if (GT_Utility.isStackInList(tPlayer.inventory.mainInventory[i], GregTech_API.sSolderingMetalList)) { - tPlayer.inventory.mainInventory[i].stackSize--; + if(tPlayer.inventory.mainInventory[i].stackSize<1)return false; + if(tPlayer.inventory.mainInventory[i].stackSize==1){tPlayer.inventory.mainInventory[i]=null;}else{ + tPlayer.inventory.mainInventory[i].stackSize--;} + if (tPlayer.inventoryContainer != null) tPlayer.inventoryContainer.detectAndSendChanges(); if (canUseElectricItem(aStack, 10000)) { return GT_ModHandler.useElectricItem(aStack, 10000, (EntityPlayer)aPlayer); diff --git a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java index 410eea616c..a3478adce8 100644 --- a/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java +++ b/main/java/gregtech/common/tileentities/machines/multi/GT_MetaTileEntity_ProcessingArray.java @@ -177,18 +177,22 @@ public class GT_MetaTileEntity_ProcessingArray extends GT_MetaTileEntity_MultiBl if(tInputList.size() > 0 || tFluids.length>0){ GT_Recipe tRecipe = map.findRecipe(getBaseMetaTileEntity(), mLastRecipe, false, gregtech.api.enums.GT_Values.V[tTier], tFluids, tInputs); if (tRecipe != null) { + if(tRecipe.mFluidInputs!=null){ + + } mLastRecipe = tRecipe; this.mEUt = 0; this.mOutputItems = null; this.mOutputFluids = null; - this.mMaxProgresstime = tRecipe.mDuration; int machines = Math.min(16,mInventory[1].stackSize); - this.mEfficiency = (10000 - (getIdealStatus() - getRepairStatus()) * 1000); - this.mEfficiencyIncrease = 10000; int i = 0; for(;i> >>> < > <= >= == != ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F", "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'", "',' is just a separator for multiple executed Codes in a row.", "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.", "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.", "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.", "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.", "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.", "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.", "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card." }); - - - - - - - - - - - - - - - - GT_Utility.getWrittenBook("Manual_Microwave", "Microwave Oven Manual", "Kitchen Industries", new String[] { "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.", "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!", "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).", "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.", "Do not insert any Metals. It might result in an Explosion.", "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.", "Do not insert inflammable Objects. The Oven will catch on Fire.", "Do not insert Explosives such as Eggs. Just don't." }); - - - - - - - - - - + GT_Utility.getWrittenBook("Manual_Printer", "Printer Manual V2.0", "Gregorius Techneticies", new String[] { + "This Manual explains the different Functionalities the GregTech Printing Factory has built in, which are not in NEI. Most got NEI Support now, but there is still some left without it.", + "1. Coloring Items and Blocks: You know those Crafting Recipes, which have a dye surrounded by 8 Item to dye them? Or the ones which have just one Item and one Dye in the Grid? Those two Recipe Types can be cheaply automated using the Printer.", + "The Colorization Functionality even optimizes the Recipes, which normally require 8 Items + 1 Dye to 1 Item and an 8th of the normally used Dye in Fluid Form, isn't that awesome?", + "2. Copying Books: This Task got slightly harder. The first Step is putting the written and signed Book inside the Scanner with a Data Stick ready to receive the Data.", + "Now insert the Stick into the Data Slot of the Printer and add 3 pieces of Paper together with 144 Liters of actual Ink Fluid. Water mixed and chemical Dyes won't work on Paper without messing things up!", + "You got a stack of Pages for your new Book, just put them into the Assembler with some Glue and a piece of Leather for the Binding, and you receive an identical copy of the Book, which would stack together with the original.", + "3. Renaming Items: This Functionality is no longer Part of the Printer. There is now a Name Mold for the Forming Press to imprint a Name into an Item, just rename the Mold in an Anvil and use it in the Forming Press on any Item.", + "4. Crafting of Books, Maps, Nametags etc etc etc: Those Recipes moved to other Machines, just look them up in NEI." }); + + GT_Utility.getWrittenBook("Manual_Punch_Cards", "Punch Card Manual V0.0", "Gregorius Techneticies", new String[] { + "This Manual will explain the Functionality of the Punch Cards, once they are fully implemented. And no, they won't be like the IRL Punch Cards. This is just a current Idea Collection.", + "(i1&&i2)?o1=15:o1=0;=10", + "ignore all Whitespace Characters, use Long for saving the Numbers", + "&& || ^^ & | ^ ! ++ -- + - % / // * ** << >> >>> < > <= >= == != ~ ( ) ?: , ; ;= ;=X; = i0 i1 i2 i3 i4 i5 o0 o1 o2 o3 o4 o5 v0 v1 v2 v3 v4 v5 v6 v7 v8 v9 m0 m1 m2 m3 m4 m5 m6 m7 m8 m9 A B C D E F", + "'0' = false, 'everything but 0' = true, '!' turns '0' into '1' and everything else into '0'", "',' is just a separator for multiple executed Codes in a row.", + "';' means that the Program waits until the next tick before continuing. ';=10' and ';=10;' both mean that it will wait 10 Ticks instead of 1. And ';=0' or anything < 0 will default to 0.", + "If the '=' Operator is used within Brackets, it returns the value the variable has been set to.", + "The Program saves the Char Index of the current Task, the 10 Variables (which reset to 0 as soon as the Program Loop stops), the 10 Member Variables and the remaining waiting Time in its NBT.", + "A = 10, B = 11, C = 12, D = 13, E = 14, F = 15, just for Hexadecimal Space saving, since Redstone has only 4 Bits.", + "For implementing Loops you just need 1 Punch Card per Loop, these Cards can restart once they are finished, depending on how many other Cards there are in the Program Loop you inserted your Card into, since it will process them procedurally.", + "A Punch Card Processor can run up to four Loops, each with the length of seven Punch Cards, parallel.", + "Why does the Punch Card need Ink to be made, you ask? Because the empty one needs to have some lines on, and the for the punched one it prints the Code to execute in a human readable format on the Card." }); + + GT_Utility.getWrittenBook("Manual_Microwave", "Microwave Oven Manual", "Kitchen Industries", new String[] { + "Congratulations, you inserted a random seemingly empty Book into the Microwave and these Letters appeared out of nowhere.", + "You just got a Microwave Oven and asked yourself 'why do I even need it?'. It's simple, the Microwave can cook for just 128 EU and at an insane speed. Not even a normal E-furnace can do it that fast and cheap!", + "This is the cheapest and fastest way to cook for you. That is why the Microwave Oven can be found in almost every Kitchen (see www.youwannabuyakitchen.ly).", + "Long time exposure to Microwaves can cause Cancer, but we doubt Steve lives long enough to die because of that.", + "Do not insert any Metals. It might result in an Explosion.", + "Do not dry Animals with it. It will result in a Hot Dog, no matter which Animal you put into it.", + "Do not insert inflammable Objects. The Oven will catch on Fire.", "Do not insert Explosives such as Eggs. Just don't." }); + GT_Log.out.println("GT_Mod: Register Items."); new GT_IntegratedCircuit_Item(); @@ -137,7 +132,6 @@ public class GT_Loader_Item_Block_And_Fluid GT_ModHandler.addCraftingRecipe(ItemList.Reactor_Coolant_NaK_6.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "PCP", "PDP", "PCP",'C', ItemList.Reactor_Coolant_NaK_3,'P', OrePrefixes.plate.get(Materials.Tin),'D',OrePrefixes.plateDense.get(Materials.Copper) }); ItemList.ThoriumCell_1.set(new GT_RadioactiveCellIC_Item("Thoriumcell", "Fuel Rod (Thorium)", 1, 50000, 0.2F,0,0.25F)); - GT_ModHandler.addShapelessCraftingRecipe(ItemList.ThoriumCell_1.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] {Ic2Items.fuelRod , OrePrefixes.dust.get(Materials.Thorium) }); ItemList.ThoriumCell_2.set(new GT_RadioactiveCellIC_Item("Double_Thoriumcell", "Double Fuel Rod (Thorium)", 2, 50000, 0.2F,0,0.25F)); GT_ModHandler.addCraftingRecipe(ItemList.ThoriumCell_2.get(1L, new Object[0]), GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE , new Object[] { "RPR", " ", " ",'R', ItemList.ThoriumCell_1 ,'P', OrePrefixes.plate.get(Materials.Iron) }); diff --git a/main/resources/assets/gregtech/lang/en_US.lang b/main/resources/assets/gregtech/lang/en_US.lang index 6a34a8e129..695cd07a8e 100644 --- a/main/resources/assets/gregtech/lang/en_US.lang +++ b/main/resources/assets/gregtech/lang/en_US.lang @@ -294,13 +294,13 @@ achievement.batterys.desc=Craft a Battery Buffer achievement.badweather=Bad Weather achievement.badweather.desc=Forget to build a Roof above your Machines achievement.electricproblems=Electric Problems -achievement.electricproblems.desc=Loose a Machine due to Overvoltage +achievement.electricproblems.desc=Lose a Machine due to Overvoltage achievement.ebf=Electric Blast Furnace achievement.ebf.desc=Craft an Electric Blast Furnace achievement.energyhatch=You need three of them achievement.energyhatch.desc=Craft a LV Energy Hatch -achievement.aluminium=Aluminium -achievement.aluminium.desc=Produce an Aluminium Ingot +achievement.gtaluminium=Aluminium +achievement.gtaluminium.desc=Produce an Aluminium Ingot achievement.highpowersmelt=High Power Smelter achievement.highpowersmelt.desc=Craft a Multi Furnace achievement.oilplant=Oil Plant diff --git a/main/resources/assets/gregtech/lang/zh_CN.lang b/main/resources/assets/gregtech/lang/zh_CN.lang index 3fad547fd1..aa7913fcad 100644 --- a/main/resources/assets/gregtech/lang/zh_CN.lang +++ b/main/resources/assets/gregtech/lang/zh_CN.lang @@ -299,8 +299,8 @@ achievement.ebf=电力高炉 achievement.ebf.desc=制造一台电力高炉 achievement.energyhatch=你需要三个 achievement.energyhatch.desc=制造一个LV级能源输入舱 -achievement.aluminium=铝 -achievement.aluminium.desc=制作一块铝锭 +achievement.gtaluminium=铝 +achievement.gtaluminium.desc=制作一块铝锭 achievement.highpowersmelt=高功率冶炼厂 achievement.highpowersmelt.desc=制造一台工业熔炉 achievement.oilplant=原油工厂 -- cgit From 836aac1d1a39d1fbea715a5b0621a98fc7fcf995 Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Wed, 14 Oct 2015 17:34:26 -0400 Subject: Update ore dictionary logger header language --- main/java/gregtech/GT_Mod.java | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 9dca7996fc..6579445ba7 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -235,18 +235,12 @@ public class GT_Mod try { List tList = ((GT_Log.LogBuffer)GT_Log.ore).mBufferedOreDictLog; - GT_Log.ore = new PrintStream(GT_Log.mOreDictLogFile); - GT_Log.ore.println("**********************************************************************"); - GT_Log.ore.println("* This is the complete Log of the GregTech OreDictionary Handler *"); - GT_Log.ore.println("* Everything in the OreDict goes through it sometimes causing Errors *"); - GT_Log.ore.println("* These Errors are getting logged aswell as properly registered Ores *"); - GT_Log.ore.println("* If you see something fishy going on in this Log, such as improper *"); - GT_Log.ore.println("* Items being registered, then mention it to the corresponding Mod *"); - GT_Log.ore.println("* In case it mentions GregTech itself improperly registering Stuff *"); - GT_Log.ore.println("* then please contact me about that immediatly *"); - GT_Log.ore.println("* *"); - GT_Log.ore.println("* In case of something being 'ignored properly', that one isnt a Bug *"); - GT_Log.ore.println("**********************************************************************"); + GT_Log.ore.println("******************************************************************************"); + GT_Log.ore.println("* This is the complete log of the GT5-Unofficial OreDictionary Handler. It *"); + GT_Log.ore.println("* processes all OreDictionary entries and can sometimes cause errors. All *"); + GT_Log.ore.println("* entries and errors are being logged. If you see an error please raise an *"); + GT_Log.ore.println("* issue at https://github.com/Blood-Asp/GT5-Unofficial. *"); + GT_Log.ore.println("******************************************************************************"); String tString; for (Iterator i$ = tList.iterator(); i$.hasNext(); GT_Log.ore.println(tString)) { tString = (String)i$.next(); @@ -1111,9 +1105,3 @@ public void onIDChangingEvent(FMLModIdMappingEvent aEvent) gregtechproxy.doSonictronSound(aStack, aWorld, aX, aY, aZ); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.GT_Mod - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file -- cgit From 22202a5fd714979676ca8b40a9c5a75ed0f50022 Mon Sep 17 00:00:00 2001 From: Shawn Buckley Date: Wed, 14 Oct 2015 22:33:33 -0400 Subject: Removed JD comments --- main/java/gregtech/GT_Mod.java | 6 ------ main/java/gregtech/api/util/GT_RecipeRegistrator.java | 2 +- main/java/gregtech/common/GT_DummyWorld.java | 6 ------ main/java/gregtech/common/GT_IteratorRandom.java | 6 ------ main/java/gregtech/common/GT_MinableOreGenerator.java | 6 ------ main/java/gregtech/common/GT_Network.java | 6 ------ main/java/gregtech/common/GT_PlayerActivityLogger.java | 6 ------ main/java/gregtech/common/GT_Server.java | 6 ------ .../java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java | 6 ------ .../common/GT_Worldgen_GT_Ore_SmallPieces.java | 6 ------ main/java/gregtech/common/GT_Worldgen_Stone.java | 6 ------ main/java/gregtech/common/GT_Worldgenerator.java | 6 ------ .../java/gregtech/common/blocks/GT_Block_Casings1.java | 6 ------ .../java/gregtech/common/blocks/GT_Block_Casings2.java | 6 ------ .../java/gregtech/common/blocks/GT_Block_Casings3.java | 6 ------ .../common/blocks/GT_Block_Casings_Abstract.java | 6 ------ .../gregtech/common/blocks/GT_Block_Concretes.java | 6 ------ .../java/gregtech/common/blocks/GT_Block_Granites.java | 6 ------ .../java/gregtech/common/blocks/GT_Block_Machines.java | 6 ------ main/java/gregtech/common/blocks/GT_Block_Ores.java | 10 ---------- .../common/blocks/GT_Block_Stones_Abstract.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Casings1.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Casings2.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Casings3.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Casings4.java | 6 ------ .../common/blocks/GT_Item_Casings_Abstract.java | 6 ------ .../java/gregtech/common/blocks/GT_Item_Concretes.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Granites.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Machines.java | 6 ------ main/java/gregtech/common/blocks/GT_Item_Ores.java | 6 ------ .../common/blocks/GT_Item_Stones_Abstract.java | 6 ------ .../gregtech/common/blocks/GT_Material_Casings.java | 6 ------ .../gregtech/common/blocks/GT_Material_Machines.java | 6 ------ main/java/gregtech/common/blocks/GT_Packet_Ores.java | 6 ------ .../gregtech/common/blocks/GT_TileEntity_Ores.java | 10 ---------- main/java/gregtech/common/covers/GT_Cover_Arm.java | 6 ------ .../gregtech/common/covers/GT_Cover_Blastproof.java | 6 ------ .../gregtech/common/covers/GT_Cover_ControlsWork.java | 6 ------ .../java/gregtech/common/covers/GT_Cover_Conveyor.java | 6 ------ .../java/gregtech/common/covers/GT_Cover_Crafting.java | 6 ------ .../java/gregtech/common/covers/GT_Cover_DoesWork.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Drain.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_EUMeter.java | 6 ------ .../gregtech/common/covers/GT_Cover_EnergyOnly.java | 6 ------ .../gregtech/common/covers/GT_Cover_ItemMeter.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Lens.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Pump.java | 6 ------ .../common/covers/GT_Cover_RedstoneConductor.java | 6 ------ .../covers/GT_Cover_RedstoneReceiverExternal.java | 6 ------ .../covers/GT_Cover_RedstoneReceiverInternal.java | 6 ------ .../common/covers/GT_Cover_RedstoneSignalizer.java | 6 ------ .../covers/GT_Cover_RedstoneTransmitterExternal.java | 6 ------ .../covers/GT_Cover_RedstoneTransmitterInternal.java | 6 ------ .../common/covers/GT_Cover_RedstoneWirelessBase.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Screen.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Shutter.java | 6 ------ main/java/gregtech/common/covers/GT_Cover_Vent.java | 6 ------ .../java/gregtech/common/entities/GT_Entity_Arrow.java | 6 ------ .../common/entities/GT_Entity_Arrow_Potion.java | 6 ------ main/java/gregtech/common/gui/GT_Container_Boiler.java | 6 ------ .../common/gui/GT_Container_BronzeBlastFurnace.java | 6 ------ .../gregtech/common/gui/GT_Container_ChestBuffer.java | 6 ------ main/java/gregtech/common/gui/GT_Container_Filter.java | 6 ------ .../gregtech/common/gui/GT_Container_Regulator.java | 6 ------ .../gregtech/common/gui/GT_Container_SuperBuffer.java | 6 ------ .../gregtech/common/gui/GT_Container_TypeFilter.java | 6 ------ .../gregtech/common/gui/GT_GUIContainer_Boiler.java | 6 ------ .../common/gui/GT_GUIContainer_BronzeBlastFurnace.java | 6 ------ .../common/gui/GT_GUIContainer_ChestBuffer.java | 6 ------ .../gregtech/common/gui/GT_GUIContainer_Filter.java | 6 ------ .../gregtech/common/gui/GT_GUIContainer_Regulator.java | 6 ------ .../common/gui/GT_GUIContainer_SuperBuffer.java | 6 ------ .../common/gui/GT_GUIContainer_TypeFilter.java | 6 ------ .../gregtech/common/items/GT_FluidDisplayItem.java | 6 ------ .../common/items/GT_IntegratedCircuit_Item.java | 6 ------ .../common/items/GT_MetaGenerated_Item_01.java | 6 ------ .../common/items/GT_MetaGenerated_Item_02.java | 6 ------ .../common/items/GT_MetaGenerated_Item_03.java | 6 ------ .../common/items/GT_MetaGenerated_Tool_01.java | 18 ++++++------------ .../java/gregtech/common/items/GT_SensorCard_Item.java | 6 ------ .../common/items/behaviors/Behaviour_Arrow.java | 6 ------ .../common/items/behaviors/Behaviour_Arrow_Potion.java | 6 ------ .../common/items/behaviors/Behaviour_Crowbar.java | 6 ------ .../common/items/behaviors/Behaviour_DataOrb.java | 6 ------ .../common/items/behaviors/Behaviour_DataStick.java | 6 ------ .../gregtech/common/items/behaviors/Behaviour_Hoe.java | 6 ------ .../common/items/behaviors/Behaviour_Lighter.java | 6 ------ .../common/items/behaviors/Behaviour_None.java | 6 ------ .../items/behaviors/Behaviour_Plunger_Essentia.java | 6 ------ .../items/behaviors/Behaviour_Plunger_Fluid.java | 6 ------ .../common/items/behaviors/Behaviour_Plunger_Item.java | 6 ------ .../common/items/behaviors/Behaviour_PrintedPages.java | 6 ------ .../common/items/behaviors/Behaviour_Prospecting.java | 6 ------ .../common/items/behaviors/Behaviour_Scanner.java | 6 ------ .../common/items/behaviors/Behaviour_Scoop.java | 6 ------ .../common/items/behaviors/Behaviour_Screwdriver.java | 6 ------ .../common/items/behaviors/Behaviour_Sense.java | 6 ------ .../common/items/behaviors/Behaviour_SensorKit.java | 6 ------ .../common/items/behaviors/Behaviour_SoftHammer.java | 6 ------ .../common/items/behaviors/Behaviour_Sonictron.java | 6 ------ .../common/items/behaviors/Behaviour_Spray_Color.java | 6 ------ .../common/items/behaviors/Behaviour_WrittenBook.java | 6 ------ .../common/redstonecircuits/GT_Circuit_BasicLogic.java | 6 ------ .../common/redstonecircuits/GT_Circuit_BitAnd.java | 6 ------ .../redstonecircuits/GT_Circuit_CombinationLock.java | 6 ------ .../common/redstonecircuits/GT_Circuit_Equals.java | 6 ------ .../common/redstonecircuits/GT_Circuit_Pulser.java | 6 ------ .../common/redstonecircuits/GT_Circuit_Randomizer.java | 6 ------ .../redstonecircuits/GT_Circuit_RedstoneMeter.java | 6 ------ .../common/redstonecircuits/GT_Circuit_Repeater.java | 6 ------ .../common/redstonecircuits/GT_Circuit_Timer.java | 6 ------ main/java/gregtech/common/render/GT_CapeRenderer.java | 6 ------ .../common/render/GT_MetaGenerated_Item_Renderer.java | 6 ------ .../common/render/GT_MetaGenerated_Tool_Renderer.java | 6 ------ main/java/gregtech/common/render/GT_RenderUtil.java | 6 ------ .../common/render/GT_Renderer_Entity_Arrow.java | 6 ------ .../automation/GT_MetaTileEntity_ChestBuffer.java | 6 ------ .../automation/GT_MetaTileEntity_Filter.java | 6 ------ .../automation/GT_MetaTileEntity_Regulator.java | 6 ------ .../automation/GT_MetaTileEntity_SuperBuffer.java | 6 ------ .../automation/GT_MetaTileEntity_TypeFilter.java | 6 ------ .../boilers/GT_MetaTileEntity_Boiler_Lava.java | 6 ------ .../boilers/GT_MetaTileEntity_Boiler_Solar.java | 6 ------ .../boilers/GT_MetaTileEntity_Boiler_Steel.java | 6 ------ .../generators/GT_MetaTileEntity_DieselGenerator.java | 6 ------ .../GT_MetaTileEntity_FluidNaquadahReactor.java | 6 ------ .../generators/GT_MetaTileEntity_GasTurbine.java | 6 ------ .../GT_MetaTileEntity_SolidNaquadahReactor.java | 6 ------ .../generators/GT_MetaTileEntity_SteamTurbine.java | 6 ------ .../machines/GT_MetaTileEntity_BasicHull_Bronze.java | 6 ------ .../GT_MetaTileEntity_BasicHull_BronzeBricks.java | 6 ------ .../machines/GT_MetaTileEntity_BasicHull_Steel.java | 6 ------ .../GT_MetaTileEntity_BasicHull_SteelBricks.java | 6 ------ .../machines/basic/GT_MetaTileEntity_Boxinator.java | 6 ------ .../machines/basic/GT_MetaTileEntity_Disassembler.java | 6 ------ .../basic/GT_MetaTileEntity_Massfabricator.java | 6 ------ .../machines/basic/GT_MetaTileEntity_PotionBrewer.java | 6 ------ .../machines/basic/GT_MetaTileEntity_Printer.java | 6 ------ .../machines/basic/GT_MetaTileEntity_Replicator.java | 6 ------ .../machines/basic/GT_MetaTileEntity_RockBreaker.java | 6 ------ .../machines/basic/GT_MetaTileEntity_Scanner.java | 6 ------ .../multi/GT_MetaTileEntity_BronzeBlastFurnace.java | 6 ------ .../multi/GT_MetaTileEntity_ElectricBlastFurnace.java | 6 ------ .../multi/GT_MetaTileEntity_ImplosionCompressor.java | 6 ------ .../machines/multi/GT_MetaTileEntity_LargeBoiler.java | 10 ---------- .../multi/GT_MetaTileEntity_LargeBoiler_Bronze.java | 6 ------ .../multi/GT_MetaTileEntity_LargeBoiler_Steel.java | 6 ------ .../GT_MetaTileEntity_LargeBoiler_TungstenSteel.java | 6 ------ .../machines/multi/GT_MetaTileEntity_MultiFurnace.java | 6 ------ .../multi/GT_MetaTileEntity_VacuumFreezer.java | 6 ------ .../steam/GT_MetaTileEntity_AlloySmelter_Bronze.java | 6 ------ .../steam/GT_MetaTileEntity_AlloySmelter_Steel.java | 6 ------ .../steam/GT_MetaTileEntity_Compressor_Bronze.java | 6 ------ .../steam/GT_MetaTileEntity_Compressor_Steel.java | 6 ------ .../steam/GT_MetaTileEntity_Extractor_Bronze.java | 6 ------ .../steam/GT_MetaTileEntity_Extractor_Steel.java | 6 ------ .../steam/GT_MetaTileEntity_ForgeHammer_Bronze.java | 6 ------ .../steam/GT_MetaTileEntity_ForgeHammer_Steel.java | 6 ------ .../steam/GT_MetaTileEntity_Furnace_Bronze.java | 6 ------ .../steam/GT_MetaTileEntity_Furnace_Steel.java | 6 ------ .../steam/GT_MetaTileEntity_Macerator_Steel.java | 6 ------ .../tileentities/storage/GT_MetaTileEntity_Locker.java | 6 ------ main/java/gregtech/common/tools/GT_Tool.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Axe.java | 6 ------ .../gregtech/common/tools/GT_Tool_BranchCutter.java | 6 ------ .../gregtech/common/tools/GT_Tool_ButcheryKnife.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_BuzzSaw.java | 6 ------ .../gregtech/common/tools/GT_Tool_Chainsaw_HV.java | 6 ------ .../gregtech/common/tools/GT_Tool_Chainsaw_LV.java | 6 ------ .../gregtech/common/tools/GT_Tool_Chainsaw_MV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Crowbar.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Drill_HV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Drill_LV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Drill_MV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_File.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_HardHammer.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Hoe.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_JackHammer.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Knife.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Mortar.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Pickaxe.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Plow.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Plunger.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_RollingPin.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Saw.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Scoop.java | 6 ------ .../gregtech/common/tools/GT_Tool_Screwdriver.java | 6 ------ .../gregtech/common/tools/GT_Tool_Screwdriver_LV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Sense.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Shovel.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_SoftHammer.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Sword.java | 6 ------ .../gregtech/common/tools/GT_Tool_UniversalSpade.java | 6 ------ .../java/gregtech/common/tools/GT_Tool_WireCutter.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Wrench_HV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Wrench_LV.java | 6 ------ main/java/gregtech/common/tools/GT_Tool_Wrench_MV.java | 6 ------ .../gregtech/loaders/load/GT_CoverBehaviorLoader.java | 6 ------ main/java/gregtech/loaders/load/GT_FuelLoader.java | 6 ------ .../java/gregtech/loaders/load/GT_SonictronLoader.java | 6 ------ main/java/gregtech/loaders/misc/GT_CoverLoader.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingAll.java | 6 ------ .../loaders/oreprocessing/ProcessingArrows.java | 6 ------ .../loaders/oreprocessing/ProcessingBattery.java | 6 ------ .../loaders/oreprocessing/ProcessingBeans.java | 6 ------ .../loaders/oreprocessing/ProcessingBlock.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingBolt.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingCell.java | 10 ---------- .../loaders/oreprocessing/ProcessingCellPlasma.java | 6 ------ .../loaders/oreprocessing/ProcessingCircuit.java | 6 ------ .../loaders/oreprocessing/ProcessingCompressed.java | 6 ------ .../loaders/oreprocessing/ProcessingCrafting.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingCrop.java | 6 ------ .../oreprocessing/ProcessingCrushedCentrifuged.java | 6 ------ .../oreprocessing/ProcessingCrushedPurified.java | 6 ------ .../loaders/oreprocessing/ProcessingCrystallized.java | 6 ------ .../loaders/oreprocessing/ProcessingDirty.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingDust.java | 6 ------ .../loaders/oreprocessing/ProcessingDustImpure.java | 6 ------ .../loaders/oreprocessing/ProcessingDustSmall.java | 6 ------ .../loaders/oreprocessing/ProcessingDustTiny.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingDye.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingFoil.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingFood.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingGear.java | 6 ------ .../loaders/oreprocessing/ProcessingGearSmall.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingGem.java | 6 ------ .../loaders/oreprocessing/ProcessingGemChipped.java | 6 ------ .../loaders/oreprocessing/ProcessingGemExquisite.java | 6 ------ .../loaders/oreprocessing/ProcessingGemFlawed.java | 6 ------ .../loaders/oreprocessing/ProcessingGemFlawless.java | 6 ------ .../loaders/oreprocessing/ProcessingIngot1.java | 6 ------ .../loaders/oreprocessing/ProcessingIngot2.java | 6 ------ .../loaders/oreprocessing/ProcessingIngot3.java | 6 ------ .../loaders/oreprocessing/ProcessingIngot4.java | 6 ------ .../loaders/oreprocessing/ProcessingIngot5.java | 6 ------ .../loaders/oreprocessing/ProcessingIngotHot.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingItem.java | 6 ------ .../loaders/oreprocessing/ProcessingLeaves.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingLens.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingLog.java | 6 ------ .../loaders/oreprocessing/ProcessingNugget.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingOre.java | 6 ------ .../loaders/oreprocessing/ProcessingOrePoor.java | 8 +------- .../loaders/oreprocessing/ProcessingOreSmelting.java | 2 +- .../loaders/oreprocessing/ProcessingPipeLarge.java | 6 ------ .../loaders/oreprocessing/ProcessingPipeMedium.java | 6 ------ .../oreprocessing/ProcessingPipeRestrictive.java | 6 ------ .../loaders/oreprocessing/ProcessingPipeSmall.java | 6 ------ .../loaders/oreprocessing/ProcessingPlank.java | 6 ------ .../loaders/oreprocessing/ProcessingPlate1.java | 6 ------ .../loaders/oreprocessing/ProcessingPlate2.java | 2 +- .../loaders/oreprocessing/ProcessingPlate3.java | 6 ------ .../loaders/oreprocessing/ProcessingPlate4.java | 6 ------ .../loaders/oreprocessing/ProcessingPlate5.java | 6 ------ .../loaders/oreprocessing/ProcessingPlate9.java | 6 ------ .../loaders/oreprocessing/ProcessingPlateAlloy.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingPure.java | 6 ------ .../loaders/oreprocessing/ProcessingRecycling.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingSand.java | 6 ------ .../loaders/oreprocessing/ProcessingSaplings.java | 6 ------ .../loaders/oreprocessing/ProcessingShaping.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingSlab.java | 6 ------ .../loaders/oreprocessing/ProcessingStick.java | 6 ------ .../loaders/oreprocessing/ProcessingStickLong.java | 6 ------ .../loaders/oreprocessing/ProcessingStone.java | 6 ------ .../loaders/oreprocessing/ProcessingStoneCobble.java | 6 ------ .../loaders/oreprocessing/ProcessingStoneVarious.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadArrow.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadAxe.java | 6 ------ .../oreprocessing/ProcessingToolHeadBuzzSaw.java | 6 ------ .../oreprocessing/ProcessingToolHeadChainsaw.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadDrill.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadFile.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadHoe.java | 6 ------ .../oreprocessing/ProcessingToolHeadPickaxe.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadPlow.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadSaw.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadSense.java | 6 ------ .../oreprocessing/ProcessingToolHeadShovel.java | 6 ------ .../loaders/oreprocessing/ProcessingToolHeadSword.java | 6 ------ .../ProcessingToolHeadUniversalSpade.java | 6 ------ .../oreprocessing/ProcessingToolHeadWrench.java | 6 ------ .../loaders/oreprocessing/ProcessingTransforming.java | 6 ------ .../gregtech/loaders/oreprocessing/ProcessingWax.java | 6 ------ .../loaders/oreprocessing/ProcessingWire01.java | 6 ------ .../loaders/oreprocessing/ProcessingWire02.java | 6 ------ .../loaders/oreprocessing/ProcessingWire04.java | 6 ------ .../loaders/oreprocessing/ProcessingWire08.java | 6 ------ .../loaders/oreprocessing/ProcessingWire12.java | 6 ------ .../loaders/oreprocessing/ProcessingWire16.java | 6 ------ .../loaders/postload/GT_BlockResistanceLoader.java | 6 ------ .../loaders/postload/GT_BookAndLootLoader.java | 6 ------ main/java/gregtech/loaders/postload/GT_CropLoader.java | 6 ------ .../loaders/postload/GT_ItemMaxStacksizeLoader.java | 6 ------ .../loaders/postload/GT_MinableRegistrator.java | 6 ------ .../loaders/postload/GT_RecyclerBlacklistLoader.java | 6 ------ .../loaders/postload/GT_ScrapboxDropLoader.java | 6 ------ .../gregtech/loaders/postload/GT_UUMRecipeLoader.java | 6 ------ .../gregtech/loaders/postload/GT_Worldgenloader.java | 6 ------ .../loaders/preload/GT_Loader_CircuitBehaviors.java | 6 ------ .../gregtech/loaders/preload/GT_Loader_ItemData.java | 6 ------ .../preload/GT_Loader_Item_Block_And_Fluid.java | 6 ------ .../loaders/preload/GT_Loader_MetaTileEntities.java | 10 ---------- .../loaders/preload/GT_Loader_OreDictionary.java | 6 ------ .../loaders/preload/GT_Loader_OreProcessing.java | 6 ------ main/java/gregtech/nei/GT_NEI_DefaultHandler.java | 6 ------ main/java/gregtech/nei/NEI_GT_Config.java | 6 ------ 308 files changed, 10 insertions(+), 1860 deletions(-) diff --git a/main/java/gregtech/GT_Mod.java b/main/java/gregtech/GT_Mod.java index 9dca7996fc..ad9b2ea38c 100644 --- a/main/java/gregtech/GT_Mod.java +++ b/main/java/gregtech/GT_Mod.java @@ -1111,9 +1111,3 @@ public void onIDChangingEvent(FMLModIdMappingEvent aEvent) gregtechproxy.doSonictronSound(aStack, aWorld, aX, aY, aZ); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.GT_Mod - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/api/util/GT_RecipeRegistrator.java b/main/java/gregtech/api/util/GT_RecipeRegistrator.java index ee9f080c8e..a11a4a1aba 100644 --- a/main/java/gregtech/api/util/GT_RecipeRegistrator.java +++ b/main/java/gregtech/api/util/GT_RecipeRegistrator.java @@ -310,4 +310,4 @@ public class GT_RecipeRegistrator { {"Scythe" , s_I+s_P+s_H, s_R+s_F+s_P, s_R+" "+" "}, {"Scythe" , s_H+s_P+s_I, s_P+s_F+s_R, " "+" "+s_R} }; -} \ No newline at end of file +} diff --git a/main/java/gregtech/common/GT_DummyWorld.java b/main/java/gregtech/common/GT_DummyWorld.java index aed129e71e..d7b26522e8 100644 --- a/main/java/gregtech/common/GT_DummyWorld.java +++ b/main/java/gregtech/common/GT_DummyWorld.java @@ -145,9 +145,3 @@ public class GT_DummyWorld return 0; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_DummyWorld - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_IteratorRandom.java b/main/java/gregtech/common/GT_IteratorRandom.java index e0e33bfd42..d61953d5c1 100644 --- a/main/java/gregtech/common/GT_IteratorRandom.java +++ b/main/java/gregtech/common/GT_IteratorRandom.java @@ -16,9 +16,3 @@ public class GT_IteratorRandom return --this.mIterationStep; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_IteratorRandom - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_MinableOreGenerator.java b/main/java/gregtech/common/GT_MinableOreGenerator.java index cd0c9bfb89..252b8896cb 100644 --- a/main/java/gregtech/common/GT_MinableOreGenerator.java +++ b/main/java/gregtech/common/GT_MinableOreGenerator.java @@ -77,9 +77,3 @@ public class GT_MinableOreGenerator return true; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_MinableOreGenerator - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Network.java b/main/java/gregtech/common/GT_Network.java index 51044140a3..3598b7e5c5 100644 --- a/main/java/gregtech/common/GT_Network.java +++ b/main/java/gregtech/common/GT_Network.java @@ -111,9 +111,3 @@ public class GT_Network } } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Network - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_PlayerActivityLogger.java b/main/java/gregtech/common/GT_PlayerActivityLogger.java index 7d5a247a40..9526c21dde 100644 --- a/main/java/gregtech/common/GT_PlayerActivityLogger.java +++ b/main/java/gregtech/common/GT_PlayerActivityLogger.java @@ -34,9 +34,3 @@ public class GT_PlayerActivityLogger catch (Throwable e) {} } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_PlayerActivityLogger - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Server.java b/main/java/gregtech/common/GT_Server.java index 4a56c538fe..cdcd954dea 100644 --- a/main/java/gregtech/common/GT_Server.java +++ b/main/java/gregtech/common/GT_Server.java @@ -34,9 +34,3 @@ public class GT_Server return null; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Server - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java b/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java index f92806b3a9..6cbe3e9b7b 100644 --- a/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java +++ b/main/java/gregtech/common/GT_Worldgen_GT_Ore_Layer.java @@ -97,9 +97,3 @@ public class GT_Worldgen_GT_Ore_Layer return true; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Worldgen_GT_Ore_Layer - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java b/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java index 6fe2bfbb08..6c7eb04db3 100644 --- a/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java +++ b/main/java/gregtech/common/GT_Worldgen_GT_Ore_SmallPieces.java @@ -47,9 +47,3 @@ public class GT_Worldgen_GT_Ore_SmallPieces return true; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Worldgen_GT_Ore_SmallPieces - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Worldgen_Stone.java b/main/java/gregtech/common/GT_Worldgen_Stone.java index f24dc9afad..d6630a24ac 100644 --- a/main/java/gregtech/common/GT_Worldgen_Stone.java +++ b/main/java/gregtech/common/GT_Worldgen_Stone.java @@ -89,9 +89,3 @@ public class GT_Worldgen_Stone return false; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Worldgen_Stone - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/GT_Worldgenerator.java b/main/java/gregtech/common/GT_Worldgenerator.java index 0d2f5fc33e..77b79efd61 100644 --- a/main/java/gregtech/common/GT_Worldgenerator.java +++ b/main/java/gregtech/common/GT_Worldgenerator.java @@ -128,9 +128,3 @@ public class GT_Worldgenerator } } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.GT_Worldgenerator - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Casings1.java b/main/java/gregtech/common/blocks/GT_Block_Casings1.java index a24aee847f..e8d3621c00 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Casings1.java +++ b/main/java/gregtech/common/blocks/GT_Block_Casings1.java @@ -88,9 +88,3 @@ public class GT_Block_Casings1 return aWorld.getBlockMetadata(aX, aY, aZ) > 9 ? super.colorMultiplier(aWorld, aX, aY, aZ) : gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[0] << 16 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[1] << 8 | gregtech.api.enums.Dyes.MACHINE_METAL.mRGBa[2]; } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Casings1 - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Casings2.java b/main/java/gregtech/common/blocks/GT_Block_Casings2.java index 73d049be37..38054eb178 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Casings2.java +++ b/main/java/gregtech/common/blocks/GT_Block_Casings2.java @@ -100,9 +100,3 @@ public class GT_Block_Casings2 return aWorld.getBlockMetadata(aX, aY, aZ) == 8 ? Blocks.bedrock.getExplosionResistance(aTNT) : super.getExplosionResistance(aTNT, aWorld, aX, aY, aZ, eX, eY, eZ); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Casings2 - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Casings3.java b/main/java/gregtech/common/blocks/GT_Block_Casings3.java index 30e46a8c45..467efc1297 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Casings3.java +++ b/main/java/gregtech/common/blocks/GT_Block_Casings3.java @@ -91,9 +91,3 @@ public class GT_Block_Casings3 return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Casings3 - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java b/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java index fa04e49024..eb8b5bcab2 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java +++ b/main/java/gregtech/common/blocks/GT_Block_Casings_Abstract.java @@ -138,9 +138,3 @@ public abstract class GT_Block_Casings_Abstract } } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Casings_Abstract - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Concretes.java b/main/java/gregtech/common/blocks/GT_Block_Concretes.java index d312719bc3..ae432fa4a6 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Concretes.java +++ b/main/java/gregtech/common/blocks/GT_Block_Concretes.java @@ -102,9 +102,3 @@ public class GT_Block_Concretes return AxisAlignedBB.getBoundingBox(aX, aY, aZ, aX + 1, aY + 0.875D, aZ + 1); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Concretes - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Granites.java b/main/java/gregtech/common/blocks/GT_Block_Granites.java index 379fb0003b..906a3a2a87 100644 --- a/main/java/gregtech/common/blocks/GT_Block_Granites.java +++ b/main/java/gregtech/common/blocks/GT_Block_Granites.java @@ -78,9 +78,3 @@ public class GT_Block_Granites return !(entity instanceof EntityWither); } } - - -/* Location: F:\Torrent\minecraft\jd-gui-0.3.6.windows\gregtech_1.7.10-5.07.07-dev.jar - * Qualified Name: gregtech.common.blocks.GT_Block_Granites - * JD-Core Version: 0.7.0.1 - */ \ No newline at end of file diff --git a/main/java/gregtech/common/blocks/GT_Block_Machines.java b/main/java/gregtech/common/blocks/GT_Block_Machines.java index dd791ec783..5f756973c4 100644 --- a/main/java/gregtech/common/