Skip to content

Commit

Permalink
Merge branch 'dev' into render
Browse files Browse the repository at this point in the history
  • Loading branch information
@basdxz
basdxz committed Jan 5, 2025
2 parents bd2abee + f593a70 commit 6e00f00
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 11 deletions.
12 changes: 7 additions & 5 deletions src/main/java/gregtech/common/GT_Client.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
import gregtech.common.net.MessageUpdateFluidDisplayItem;
import gregtech.common.render.*;
import ic2.api.tile.IWrenchable;
import lombok.val;
import net.minecraft.block.Block;
import net.minecraft.client.Minecraft;
import net.minecraft.client.renderer.GLAllocation;
Expand Down Expand Up @@ -514,12 +515,13 @@ public int getReloadCount() {
*/
@Override
public EntityPlayer getPlayerFromUUID(final UUID uuid) {
return MinecraftServer.getServer().getEntityWorld().func_152378_a(uuid);
/* val player = Minecraft.getMinecraft().thePlayer;
if (player.getUniqueID().equals(uuid)) {
return player;
for (val worldServer: MinecraftServer.getServer().worldServers) {
final EntityPlayer result = worldServer.func_152378_a(uuid);
if (result != null) {
return result;
}
}
return null; */
return null;
}

@SubscribeEvent
Expand Down
9 changes: 8 additions & 1 deletion src/main/java/gregtech/common/GT_Server.java
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package gregtech.common;

import lombok.val;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
import net.minecraft.server.MinecraftServer;
Expand Down Expand Up @@ -44,7 +45,13 @@ public EntityPlayer getThePlayer() {
*/
@Override
public EntityPlayer getPlayerFromUUID(final UUID uuid) {
return MinecraftServer.getServer().getEntityWorld().func_152378_a(uuid);
for (val worldServer: MinecraftServer.getServer().worldServers) {
final EntityPlayer result = worldServer.func_152378_a(uuid);
if (result != null) {
return result;
}
}
return null;
}

}
10 changes: 5 additions & 5 deletions src/main/java/gregtech/loaders/preload/metatileentity/BasicMachineLoader.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,11 @@ public final class BasicMachineLoader {
public static void load() {
if (LOADED)
throw new RuntimeException("Already loaded!");
Machine_LV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(201, "basicmachine.alloysmelter.tier.01", "Basic Alloy Smelter", 1, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(208)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_LV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_MV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(202, "basicmachine.alloysmelter.tier.02", "Advanced Alloy Smelter", 2, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(208)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_MV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_HV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(203, "basicmachine.alloysmelter.tier.03", "Advanced Alloy Smelter II", 3, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(208)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_HV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_EV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(204, "basicmachine.alloysmelter.tier.04", "Advanced Alloy Smelter III", 4, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(208)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_EV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_IV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(205, "basicmachine.alloysmelter.tier.05", "Advanced Alloy Smelter IV", 5, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(208)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_IV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_LV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(201, "basicmachine.alloysmelter.tier.01", "Basic Alloy Smelter", 1, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_LV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_MV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(202, "basicmachine.alloysmelter.tier.02", "Advanced Alloy Smelter", 2, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_MV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_HV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(203, "basicmachine.alloysmelter.tier.03", "Advanced Alloy Smelter II", 3, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_HV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_EV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(204, "basicmachine.alloysmelter.tier.04", "Advanced Alloy Smelter III", 4, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_EV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));
Machine_IV_AlloySmelter.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(205, "basicmachine.alloysmelter.tier.05", "Advanced Alloy Smelter IV", 5, "HighTech combination Smelter", sAlloySmelterRecipes, 2, 1, 0, 0, 1, "AlloySmelter.png", sSoundList.get(Integer.valueOf(223)), false, false, 0, "ALLOY_SMELTER", new Object[]{"ECE", "CMC", "WCW", 'M', HULL, 'E', circuitPower.get(PWR_IV), 'W', WIRE, 'C', COIL_HEATING_DOUBLE}).getStackForm(1L));

Machine_LV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(211, "basicmachine.assembler.tier.01", "Basic Assembling Machine", 1, "Avengers, Assemble!", sAssemblerRecipes, 6, 1, 16000, 0, 1, "Assembler.png", "", false, false, 0, "ASSEMBLER", new Object[]{"ACA", "VMV", "WCW", 'M', HULL, 'V', CONVEYOR, 'A', ROBOT_ARM, 'C', circuitLogic.get(LOGIC_LV), 'W', WIRE}).getStackForm(1L));
Machine_MV_Assembler.set(new GT_MetaTileEntity_BasicMachine_GT_Recipe(212, "basicmachine.assembler.tier.02", "Advanced Assembling Machine", 2, "Avengers, Assemble!", sAssemblerRecipes, 9, 1, 24000, 0, 1, "Assembler2.png", "", false, false, 0, "ASSEMBLER", new Object[]{"ACA", "VMV", "WCW", 'M', HULL, 'V', CONVEYOR, 'A', ROBOT_ARM, 'C', circuitLogic.get(LOGIC_MV), 'W', WIRE}).getStackForm(1L));
Expand Down

0 comments on commit 6e00f00

Please sign in to comment.