aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRaven Szewczyk <git@kubasz.xyz>2023-01-24 13:10:26 +0000
committerGitHub <noreply@github.com>2023-01-24 14:10:26 +0100
commitd011703990735b4f366c7effea5487c7b05059c3 (patch)
tree6206952ebc3bd9f28ff1abdfb65dd48f7733e162 /src
parenta5064b298efd9f0df2a39b225f7f42ba55dea9e4 (diff)
downloadGT5-Unofficial-d011703990735b4f366c7effea5487c7b05059c3.tar.gz
GT5-Unofficial-d011703990735b4f366c7effea5487c7b05059c3.tar.bz2
GT5-Unofficial-d011703990735b4f366c7effea5487c7b05059c3.zip
Make reflection Java 12+ compatible (#274)
* Make reflection Java 12+ compatible * Remove unused methods * Remove gtnhlib as it is no longer needed Former-commit-id: 250fd0442765e59b2a6d19707c852ec498b5ae40
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java23
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java27
2 files changed, 0 insertions, 50 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
index 71eb970abb..c272985aa4 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/StaticRecipeChangeLoaders.java
@@ -49,7 +49,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Recipe.GT_Recipe_Map;
import gregtech.api.util.GT_Utility;
import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.*;
import java.util.stream.Collectors;
import net.minecraft.init.Blocks;
@@ -59,7 +58,6 @@ import net.minecraftforge.fluids.FluidRegistry;
import net.minecraftforge.fluids.FluidStack;
import net.minecraftforge.oredict.OreDictionary;
import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.reflect.FieldUtils;
public class StaticRecipeChangeLoaders {
@@ -697,27 +695,6 @@ public class StaticRecipeChangeLoaders {
|| GT_Utility.areStacksEqual(input, ItemList.Block_Powderbarrel.get(1L)));
}
- public static void patchEBFMapForCircuitUnification() {
- Field mUsualInputCount = FieldUtils.getField(GT_Recipe.GT_Recipe_Map.class, "mUsualInputCount", true);
- mUsualInputCount.setAccessible(true);
-
- try {
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- modifiersField.setAccessible(true);
- modifiersField.setInt(mUsualInputCount, mUsualInputCount.getModifiers() & ~Modifier.FINAL);
- mUsualInputCount.setInt(GT_Recipe.GT_Recipe_Map.sBlastRecipes, 3);
- } catch (IllegalAccessException | NoSuchFieldException e) {
- e.printStackTrace();
- }
- }
-
- public static void synchroniseCircuitUseMulti() {
- GT_Recipe.GT_Recipe_Map[] gt_recipe_maps = {
- GT_Recipe.GT_Recipe_Map.sMultiblockChemicalRecipes, GT_Recipe.GT_Recipe_Map.sBlastRecipes
- };
- getRecipesByCircuitID(gt_recipe_maps).forEach(StaticRecipeChangeLoaders::transformCircuitRecipes);
- }
-
private static int getBlastLogic(GT_Recipe recipe) {
int ret = 0;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
index cb9084e608..92c6dc696c 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/GT_Enhancement/PlatinumSludgeOverHaul.java
@@ -48,7 +48,6 @@ import gregtech.api.util.GT_Recipe;
import gregtech.api.util.GT_Utility;
import gregtech.common.blocks.GT_Block_Ores_Abstract;
import java.lang.reflect.Field;
-import java.lang.reflect.Modifier;
import java.util.*;
import net.minecraft.block.Block;
import net.minecraft.item.ItemStack;
@@ -957,32 +956,6 @@ public class PlatinumSludgeOverHaul {
if (in == null) in = CachedReflectionUtils.getField(recipe.getClass(), inputItemName);
if (in == null) return;
- // directly copied from the apache commons collection, cause GTNH had problems with that particular function for
- // some reason?
- // this part here is NOT MIT LICENSED BUT LICSENSED UNDER THE Apache License, Version 2.0!
- try {
- if (Modifier.isFinal(in.getModifiers())) {
- // Do all JREs implement Field with a private ivar called "modifiers"?
- Field modifiersField = Field.class.getDeclaredField("modifiers");
- boolean doForceAccess = !modifiersField.isAccessible();
- if (doForceAccess) {
- modifiersField.setAccessible(true);
- }
- try {
- modifiersField.setInt(in, in.getModifiers() & ~Modifier.FINAL);
- } finally {
- if (doForceAccess) {
- modifiersField.setAccessible(false);
- }
- }
- }
- } catch (NoSuchFieldException ignored) {
- // The field class contains always a modifiers field
- } catch (IllegalAccessException ignored) {
- // The modifiers field is made accessible
- }
- // END OF APACHE COMMONS COLLECTION COPY
-
Object input;
try {
input = in.get(obj);