Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

update gt and rename #19

Merged
merged 3 commits into from
Sep 3, 2024
Merged

update gt and rename #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
178975e
update gt and rename
NotAPenguin0 Sep 3, 2024
7b4913c
update deps
boubou19 Sep 3, 2024
db34d67
bump VP
NotAPenguin0 Sep 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies {
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.23:dev')
implementation('com.github.GTNewHorizons:VisualProspecting:1.3.10:dev')
implementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.57:dev')
implementation('com.github.GTNewHorizons:VisualProspecting:1.3.12:dev')
}
4 changes: 2 additions & 2 deletions src/main/java/com/encraft/dz/container/ContainerBuildingKit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import com.encraft.dz.inventory.InventoryBuildingKit;

import gregtech.api.util.GT_Utility;
import gregtech.api.util.GTUtility;

public class ContainerBuildingKit extends Container {

Expand Down Expand Up @@ -57,7 +57,7 @@ public ItemStack transferStackInSlot(EntityPlayer player, int par2) {
Slot toSlot = (Slot) this.inventorySlots.get(i);
ItemStack toPlace = toSlot.getStack();

if (GT_Utility.areStacksEqual(toMove, toPlace) && toPlace.stackSize < toPlace.getMaxStackSize()) {
if (GTUtility.areStacksEqual(toMove, toPlace) && toPlace.stackSize < toPlace.getMaxStackSize()) {
toPlace.stackSize++;
fromSlot.putStack(null);
canMerge = true;
Expand Down
10 changes: 5 additions & 5 deletions src/main/java/com/encraft/dz/handlers/Recipes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package com.encraft.dz.handlers;

import gregtech.api.enums.GT_Values;
import gregtech.api.enums.GTValues;
import gregtech.api.enums.Materials;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.util.GT_ModHandler;
import gregtech.api.util.GTModHandler;

public class Recipes implements Runnable {

public void run() {
GT_ModHandler.addCraftingRecipe(
GT_ModHandler.getModItem("ifu", "ifu_buildingKit", 1, GT_Values.W),
GT_ModHandler.RecipeBits.BUFFERED | GT_ModHandler.RecipeBits.NOT_REMOVABLE,
GTModHandler.addCraftingRecipe(
GTModHandler.getModItem("ifu", "ifu_buildingKit", 1, GTValues.W),
GTModHandler.RecipeBits.BUFFERED | GTModHandler.RecipeBits.NOT_REMOVABLE,
new Object[] { "XrX", "SGS", "RIR", 'X', OrePrefixes.stick.get(Materials.IronMagnetic), 'S',
OrePrefixes.stick.get(Materials.Wood), 'G', OrePrefixes.ring.get(Materials.Gold), 'I',
OrePrefixes.stick.get(Materials.Iron), 'R', OrePrefixes.dust.get(Materials.Redstone) });
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/encraft/dz/items/ItemOreFinderTool.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
import cpw.mods.fml.relauncher.SideOnly;
import gregtech.api.enums.OrePrefixes;
import gregtech.api.objects.ItemData;
import gregtech.api.util.GT_OreDictUnificator;
import gregtech.api.util.GTOreDictUnificator;

public class ItemOreFinderTool extends Item {

Expand Down Expand Up @@ -149,7 +149,7 @@ public void onUpdate(ItemStack itemstack, World world, Entity entity, int par4,
}
}

ItemData data = GT_OreDictUnificator.getAssociation(searchItem);
ItemData data = GTOreDictUnificator.getAssociation(searchItem);

boolean vanilla = (data == null || data.mMaterial == null || data.mMaterial.mMaterial == null);

Expand Down Expand Up @@ -177,7 +177,7 @@ public void onUpdate(ItemStack itemstack, World world, Entity entity, int par4,
int meta = tBlock.getDamageValue(world, x1, y1, z1);
ItemStack inWorld = new ItemStack(tBlock, 1, meta);
if (!vanilla) {
ItemData dataInWorld = GT_OreDictUnificator.getAssociation(inWorld);
ItemData dataInWorld = GTOreDictUnificator.getAssociation(inWorld);
if (dataInWorld == null || dataInWorld.mPrefix == null
|| dataInWorld.mMaterial == null
|| dataInWorld.mMaterial.mMaterial == null)
Expand Down