From cf50206d38abcc4136d9f200c5870bf7a58b941e Mon Sep 17 00:00:00 2001 From: Dennis <47501679+Denostrov@users.noreply.github.com> Date: Mon, 5 Jun 2023 00:07:49 +0300 Subject: fix lag by disabling asm that messed with tinkers fluid lighting (#654) * disable asm that messed with tinkers fluid lighting * remove unused config and asm file --- .../gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java | 60 ---------------------- 1 file changed, 60 deletions(-) (limited to 'src/main/java/gtPlusPlus/xmod') diff --git a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java index bddde1de38..b148e283ac 100644 --- a/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java +++ b/src/main/java/gtPlusPlus/xmod/tinkers/HANDLER_Tinkers.java @@ -2,15 +2,10 @@ package gtPlusPlus.xmod.tinkers; import static gregtech.api.enums.Mods.TinkerConstruct; -import java.lang.reflect.Field; - -import net.minecraft.block.Block; import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; -import gtPlusPlus.api.objects.Logger; import gtPlusPlus.api.objects.data.AutoMap; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial; import gtPlusPlus.xmod.tinkers.util.TinkersDryingRecipe; import gtPlusPlus.xmod.tinkers.util.TinkersUtils; @@ -34,61 +29,6 @@ public class HANDLER_Tinkers { for (BaseTinkersMaterial y : mTinkerMaterials) { // y.generate(); } - - Class aTinkersSmeltery = ReflectionUtils.getClass("tconstruct.smeltery.TinkerSmeltery"); - AutoMap aTweakedFluids = new AutoMap(); - if (aTinkersSmeltery != null) { - try { - Logger.INFO( - "Manipulating the light levels of fluids in TiCon. Molten 'metals' in world are now very luminescent!"); - Field aFluidArrayField = ReflectionUtils.getField(aTinkersSmeltery, "fluids"); - Field aBlockArrayField = ReflectionUtils.getField(aTinkersSmeltery, "fluidBlocks"); - Fluid[] aTiconFluids = (Fluid[]) aFluidArrayField.get(null); - Block[] aTiconFluidBlocks = (Block[]) aBlockArrayField.get(null); - if (aTiconFluids != null && aTiconFluidBlocks != null) { - for (Fluid a : aTiconFluids) { - if (a == null) { - continue; - } else { - if (a.getLuminosity() <= 15) { - // if (a.getTemperature() >= 500) { - a.setLuminosity(16); - aTweakedFluids.put(a); - // } - } else { - aTweakedFluids.put(a); - continue; - } - } - } - for (Block a : aTiconFluidBlocks) { - if (a == null) { - continue; - } else { - Fluid f = FluidRegistry.lookupFluidForBlock(a); - boolean isHot = false; - if (f != null && f.getTemperature() >= 500) { - if (f.getLuminosity() <= 16 && !aTweakedFluids.containsValue(f)) { - f.setLuminosity(16); - } - isHot = true; - } - if (a.getLightValue() <= 16f) { - if (isHot) { - a.setLightLevel(16f); - } else { - if (a.getLightValue() <= 16f) { - a.setLightLevel(16f); - } - } - } else { - continue; - } - } - } - } - } catch (IllegalArgumentException | IllegalAccessException e) {} - } } } } -- cgit