Skip to content

Commit 498ee5e

Browse files
NotAPenguin0NotAPenguin0
authored
rename (#34)
1 parent 9a3027b commit 498ee5e

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎dependencies.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
dependencies {
44
compileOnlyApi('com.github.GTNewHorizons:Angelica:1.0.0-beta2:api')
55
compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-421-GTNH:api') {transitive=false}
6-
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.48.120:dev') {transitive=false}
6+
compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev') {transitive=false}
77
compileOnly('com.github.GTNewHorizons:NotEnoughItems:2.6.19-GTNH:dev') {transitive=false}
88
compileOnly('com.github.GTNewHorizons:waila:1.8.1:dev') {transitive=false}
99
compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev')

‎src/main/java/com/jaquadro/minecraft/storagedrawers/integration/gtnh/ModRecipes.java

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import static com.jaquadro.minecraft.storagedrawers.StorageDrawers.config;
44
import static gregtech.api.recipe.RecipeMaps.assemblerRecipes;
5-
import static gregtech.api.util.GT_RecipeBuilder.MINUTES;
6-
import static gregtech.api.util.GT_RecipeBuilder.SECONDS;
5+
import static gregtech.api.util.GTRecipeBuilder.MINUTES;
6+
import static gregtech.api.util.GTRecipeBuilder.SECONDS;
77
import static net.minecraftforge.fluids.FluidRegistry.getFluidStack;
88

99
import net.minecraft.init.Blocks;
@@ -19,10 +19,10 @@
1919

2020
import cpw.mods.fml.common.registry.GameRegistry;
2121
import cpw.mods.fml.common.registry.GameRegistry.UniqueIdentifier;
22-
import gregtech.api.enums.GT_Values;
22+
import gregtech.api.enums.GTValues;
2323
import gregtech.api.enums.Materials;
2424
import gregtech.api.enums.TierEU;
25-
import gregtech.api.util.GT_Utility;
25+
import gregtech.api.util.GTUtility;
2626

2727
public class ModRecipes {
2828

@@ -78,11 +78,11 @@ public class ModRecipes {
7878
private static final ItemStack chest2 = new ItemStack(Blocks.chest, 2);
7979
private static final ItemStack chest4 = new ItemStack(Blocks.chest, 4);
8080
private static final ItemStack chest5 = new ItemStack(Blocks.chest, 5);
81-
private static final ItemStack integratedCircuit1 = GT_Utility.getIntegratedCircuit(1);
82-
private static final ItemStack integratedCircuit2 = GT_Utility.getIntegratedCircuit(2);
83-
private static final ItemStack integratedCircuit4 = GT_Utility.getIntegratedCircuit(4);
84-
private static final ItemStack integratedCircuit12 = GT_Utility.getIntegratedCircuit(12);
85-
private static final ItemStack integratedCircuit14 = GT_Utility.getIntegratedCircuit(14);
81+
private static final ItemStack integratedCircuit1 = GTUtility.getIntegratedCircuit(1);
82+
private static final ItemStack integratedCircuit2 = GTUtility.getIntegratedCircuit(2);
83+
private static final ItemStack integratedCircuit4 = GTUtility.getIntegratedCircuit(4);
84+
private static final ItemStack integratedCircuit12 = GTUtility.getIntegratedCircuit(12);
85+
private static final ItemStack integratedCircuit14 = GTUtility.getIntegratedCircuit(14);
8686

8787
// Ingredients for Framed Drawers recipes
8888
private static final ItemStack carpentersBlock8 = GameRegistry
@@ -219,7 +219,7 @@ private static void fullDrawers1Recipes() {
219219

220220
// Oak Drawer Full 1x1 Gregtech Assembler recipes
221221
for (ItemStack slabWood8W : slabWood8WList)
222-
GT_Values.RA.stdBuilder().itemInputs(slabWood8W, chest1, integratedCircuit1).itemOutputs(fullDrawer1)
222+
GTValues.RA.stdBuilder().itemInputs(slabWood8W, chest1, integratedCircuit1).itemOutputs(fullDrawer1)
223223
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
224224

225225
// Framed Drawer Full 1x1
@@ -232,7 +232,7 @@ private static void fullDrawers1Recipes() {
232232
new ShapedOreRecipe(fullCustom1, "bbb", "bcb", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood));
233233

234234
// Framed Drawer Full 1x1 Gregtech Assembler recipe
235-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock8, chest1, integratedCircuit1).itemOutputs(fullCustom1)
235+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock8, chest1, integratedCircuit1).itemOutputs(fullCustom1)
236236
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
237237
}
238238

@@ -250,7 +250,7 @@ private static void fullDrawers2Recipes() {
250250

251251
// Oak Drawer Full 1x2 Gregtech Assembler recipes
252252
for (ItemStack slabWood7W : slabWood7WList)
253-
GT_Values.RA.stdBuilder().itemInputs(slabWood7W, chest2, integratedCircuit2).itemOutputs(fullDrawers2)
253+
GTValues.RA.stdBuilder().itemInputs(slabWood7W, chest2, integratedCircuit2).itemOutputs(fullDrawers2)
254254
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
255255

256256
// Framed Drawer Full 1x2
@@ -263,7 +263,7 @@ private static void fullDrawers2Recipes() {
263263
new ShapedOreRecipe(fullCustom2, "bcb", "bbb", "bcb", 'b', carpentersBlock1, 'c', ORE_chestWood));
264264

265265
// Framed Drawer Full 1x2 Gregtech Assembler recipe
266-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock7, chest2, integratedCircuit2).itemOutputs(fullCustom2)
266+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock7, chest2, integratedCircuit2).itemOutputs(fullCustom2)
267267
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
268268
}
269269

@@ -281,7 +281,7 @@ private static void fullDrawers4Recipes() {
281281

282282
// Oak Drawer Full 2x2 Gregtech Assembler recipes
283283
for (ItemStack slabWood5W : slabWood5WList)
284-
GT_Values.RA.stdBuilder().itemInputs(slabWood5W, chest4, integratedCircuit4).itemOutputs(fullDrawers4)
284+
GTValues.RA.stdBuilder().itemInputs(slabWood5W, chest4, integratedCircuit4).itemOutputs(fullDrawers4)
285285
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
286286

287287
// Framed Drawer Full 2x2
@@ -294,7 +294,7 @@ private static void fullDrawers4Recipes() {
294294
new ShapedOreRecipe(fullCustom4, "cbc", "bbb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood));
295295

296296
// Framed Drawer Full 2x2 Gregtech Assembler recipe
297-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock5, chest4, integratedCircuit4).itemOutputs(fullCustom4)
297+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock5, chest4, integratedCircuit4).itemOutputs(fullCustom4)
298298
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
299299
}
300300

@@ -312,7 +312,7 @@ private static void halfDrawers2Recipes() {
312312

313313
// Oak Drawer Half 1x2 Gregtech Assembler recipes
314314
for (ItemStack slabWood7W : slabWood7WList)
315-
GT_Values.RA.stdBuilder().itemInputs(slabWood7W, chest2, integratedCircuit12).itemOutputs(halfDrawers2)
315+
GTValues.RA.stdBuilder().itemInputs(slabWood7W, chest2, integratedCircuit12).itemOutputs(halfDrawers2)
316316
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
317317

318318
// Framed Drawer Half 1x2
@@ -325,7 +325,7 @@ private static void halfDrawers2Recipes() {
325325
new ShapedOreRecipe(halfCustom2, "bbb", "cbc", "bbb", 'b', carpentersBlock1, 'c', ORE_chestWood));
326326

327327
// Framed Drawer Half 1x2 Gregtech Assembler recipe
328-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock7, chest2, integratedCircuit12).itemOutputs(halfCustom2)
328+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock7, chest2, integratedCircuit12).itemOutputs(halfCustom2)
329329
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
330330
}
331331

@@ -342,7 +342,7 @@ private static void halfDrawers4Recipes() {
342342
new ShapedOreRecipe(halfDrawers4, "csc", "scs", "csc", 's', ORE_slabWood, 'c', ORE_chestWood));
343343

344344
for (ItemStack slabWood4W : slabWood4WList)
345-
GT_Values.RA.stdBuilder().itemInputs(slabWood4W, chest5, integratedCircuit14).itemOutputs(halfDrawers4)
345+
GTValues.RA.stdBuilder().itemInputs(slabWood4W, chest5, integratedCircuit14).itemOutputs(halfDrawers4)
346346
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
347347

348348
// Framed Drawer Half 2x2
@@ -355,7 +355,7 @@ private static void halfDrawers4Recipes() {
355355
new ShapedOreRecipe(halfCustom4, "cbc", "bcb", "cbc", 'b', carpentersBlock1, 'c', ORE_chestWood));
356356

357357
// Framed Drawer Half 2x2 Gregtech Assembler recipe
358-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock4, chest5, integratedCircuit14).itemOutputs(halfCustom4)
358+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock4, chest5, integratedCircuit14).itemOutputs(halfCustom4)
359359
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
360360
}
361361

@@ -372,7 +372,7 @@ private static void trimRecipes() {
372372

373373
// Oak Trim Gregtech Assembler recipe
374374
for (ItemStack slabWood5W : slabWood5WList)
375-
GT_Values.RA.stdBuilder().itemInputs(slabWood5W, stick4, integratedCircuit1).itemOutputs(trim)
375+
GTValues.RA.stdBuilder().itemInputs(slabWood5W, stick4, integratedCircuit1).itemOutputs(trim)
376376
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
377377

378378
// Framed Trim
@@ -385,7 +385,7 @@ private static void trimRecipes() {
385385
new ShapedOreRecipe(trimCustom, "tbt", "bbb", "tbt", 'b', carpentersBlock1, 't', ORE_stickWood));
386386

387387
// Framed Trim Gregtech Assembler recipe
388-
GT_Values.RA.stdBuilder().itemInputs(carpentersBlock5, stick4, integratedCircuit1).itemOutputs(trimCustom)
388+
GTValues.RA.stdBuilder().itemInputs(carpentersBlock5, stick4, integratedCircuit1).itemOutputs(trimCustom)
389389
.duration(10 * SECONDS).eut(16).addTo(assemblerRecipes);
390390
}
391391

@@ -490,7 +490,7 @@ private static void upgradeTemplateRecipes() {
490490
't',
491491
ORE_craftingToolScrewdriver));
492492

493-
for (ItemStack drawer : drawerBasicW) GT_Values.RA.stdBuilder().itemInputs(drawer, piston)
493+
for (ItemStack drawer : drawerBasicW) GTValues.RA.stdBuilder().itemInputs(drawer, piston)
494494
.itemOutputs(upgradeTemplate).duration(1 * MINUTES).eut(16).addTo(assemblerRecipes);
495495
}
496496

@@ -743,7 +743,7 @@ private static void shroudKeyUpgradeRecipes() {
743743
if (!config.cache.enableShroudUpgrades) return;
744744

745745
// Concealment Key
746-
GT_Values.RA.stdBuilder().itemInputs(upgradeLock, new ItemStack(Items.ender_eye))
746+
GTValues.RA.stdBuilder().itemInputs(upgradeLock, new ItemStack(Items.ender_eye))
747747
.itemOutputs(new ItemStack(ModItems.shroudKey)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV)
748748
.addTo(assemblerRecipes);
749749
}
@@ -752,7 +752,7 @@ private static void personalKeyUpgradeRecipes() {
752752
if (!config.cache.enablePersonalUpgrades) return;
753753

754754
// Storage Personal Key
755-
GT_Values.RA.stdBuilder().itemInputs(upgradeLock, new ItemStack(Items.name_tag))
755+
GTValues.RA.stdBuilder().itemInputs(upgradeLock, new ItemStack(Items.name_tag))
756756
.itemOutputs(new ItemStack(ModItems.personalKey)).duration(5 * SECONDS).eut(TierEU.RECIPE_LV)
757757
.addTo(assemblerRecipes);
758758
}
@@ -761,11 +761,11 @@ private static void packingTapeRecipes() {
761761
if (!config.cache.enableTape) return;
762762

763763
// Packing Tape
764-
GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.paper), integratedCircuit1)
764+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.paper), integratedCircuit1)
765765
.fluidInputs(getFluidStack("glue", 144)).itemOutputs(new ItemStack(ModItems.tape))
766766
.duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
767767

768-
GT_Values.RA.stdBuilder().itemInputs(new ItemStack(Items.paper), integratedCircuit1)
768+
GTValues.RA.stdBuilder().itemInputs(new ItemStack(Items.paper), integratedCircuit1)
769769
.fluidInputs(Materials.Glue.getFluid(144)).itemOutputs(new ItemStack(ModItems.tape))
770770
.duration(10 * SECONDS).eut(TierEU.RECIPE_LV).addTo(assemblerRecipes);
771771
}

0 commit comments

Comments
 (0)