aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGlease <4586901+Glease@users.noreply.github.com>2021-12-03 21:47:12 +0800
committerGlease <4586901+Glease@users.noreply.github.com>2021-12-03 21:47:12 +0800
commit5a34da7fbebbd9f780a1458b0d310dadbda7d78d (patch)
treeaa2853af7a849d3019579c3780740c1615f109f2 /src
parent48229a248951bcce901df2cc03a199ff2a2899f7 (diff)
downloadGT5-Unofficial-5a34da7fbebbd9f780a1458b0d310dadbda7d78d.tar.gz
GT5-Unofficial-5a34da7fbebbd9f780a1458b0d310dadbda7d78d.tar.bz2
GT5-Unofficial-5a34da7fbebbd9f780a1458b0d310dadbda7d78d.zip
Fix ASM problem attempt 2
Former-commit-id: 9e7f7e39f1dd6c8778506c203387913841f74d6c
Diffstat (limited to 'src')
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java (renamed from src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java)2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java (renamed from src/main/java/com/github/bartimaeusnek/ASM/BWCore.java)4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java (renamed from src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java)4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java (renamed from src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java)2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java (renamed from src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java)4
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java2
-rw-r--r--src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java2
8 files changed, 11 insertions, 11 deletions
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java
index 9055909567..48a8f49d5c 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/ASMUtils.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/ASMUtils.java
@@ -20,7 +20,7 @@
* SOFTWARE.
*/
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
import org.objectweb.asm.tree.MethodNode;
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java
index 6592da592f..e97de8cf21 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCore.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCore.java
@@ -20,7 +20,7 @@
* SOFTWARE.
*/
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
import com.github.bartimaeusnek.bartworks.MainMod;
import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
@@ -39,7 +39,7 @@ import org.apache.logging.log4j.Logger;
import java.util.ArrayList;
import java.util.List;
-import static com.github.bartimaeusnek.ASM.BWCoreTransformer.shouldTransform;
+import static com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer.shouldTransform;
@SuppressWarnings("ALL")
public class BWCore extends DummyModContainer {
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java
index bbaff54ba1..37a64add7c 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCorePlugin.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCorePlugin.java
@@ -20,7 +20,7 @@
* SOFTWARE.
*/
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
import cpw.mods.fml.relauncher.FMLInjectionData;
@@ -33,7 +33,7 @@ import java.util.Map;
@IFMLLoadingPlugin.SortingIndex(Integer.MAX_VALUE)//Load as late as possible (after fastcraft/OptiFine).
@IFMLLoadingPlugin.MCVersion("1.7.10")
-@IFMLLoadingPlugin.TransformerExclusions("com.github.bartimaeusnek.ASM")
+@IFMLLoadingPlugin.TransformerExclusions("com.github.bartimaeusnek.bartworks.ASM")
@IFMLLoadingPlugin.Name(BWCorePlugin.BWCORE_PLUGIN_NAME)
public class BWCorePlugin implements IFMLLoadingPlugin {
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java
index 47705042a9..e4b14820c7 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes.java
@@ -20,7 +20,7 @@
* SOFTWARE.
*/
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
import com.github.bartimaeusnek.bartworks.util.NonNullWrappedHashSet;
import com.github.bartimaeusnek.bartworks.util.accessprioritylist.AccessPriorityList;
diff --git a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java
index 775c3fc9b1..4ea3582bd1 100644
--- a/src/main/java/com/github/bartimaeusnek/ASM/BWCoreTransformer.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/ASM/BWCoreTransformer.java
@@ -20,7 +20,7 @@
* SOFTWARE.
*/
-package com.github.bartimaeusnek.ASM;
+package com.github.bartimaeusnek.bartworks.ASM;
import net.minecraft.launchwrapper.IClassTransformer;
import org.objectweb.asm.ClassReader;
@@ -294,7 +294,7 @@ public class BWCoreTransformer implements IClassTransformer {
toPatch.instructions = new InsnList();
toPatch.instructions.add(new VarInsnNode(ALOAD,1));
toPatch.instructions.add(new VarInsnNode(ALOAD,2));
- toPatch.instructions.add(new MethodInsnNode(INVOKESTATIC,"com/github/bartimaeusnek/ASM/BWCoreStaticReplacementMethodes","findCachedMatchingRecipe","(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;",false));
+ toPatch.instructions.add(new MethodInsnNode(INVOKESTATIC,"com/github/bartimaeusnek/bartworks/ASM/BWCoreStaticReplacementMethodes","findCachedMatchingRecipe","(Lnet/minecraft/inventory/InventoryCrafting;Lnet/minecraft/world/World;)Lnet/minecraft/item/ItemStack;",false));
toPatch.instructions.add(new InsnNode(ARETURN));
break scase;
}
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
index f9aba701a6..0beec2c8af 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/commands/ClearCraftingCache.java
@@ -22,7 +22,7 @@
package com.github.bartimaeusnek.bartworks.common.commands;
-import com.github.bartimaeusnek.ASM.BWCoreStaticReplacementMethodes;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreStaticReplacementMethodes;
import net.minecraft.command.CommandBase;
import net.minecraft.command.ICommandSender;
import net.minecraft.util.ChatComponentText;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
index 64095f5cc4..11c97e6b8e 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/configs/ConfigHandler.java
@@ -23,7 +23,7 @@
package com.github.bartimaeusnek.bartworks.common.configs;
-import com.github.bartimaeusnek.ASM.BWCoreTransformer;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreTransformer;
import com.github.bartimaeusnek.bartworks.API.API_ConfigValues;
import net.minecraftforge.common.config.Configuration;
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
index 6831198a56..90740455c2 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/CircuitGeneration/CircuitImprintLoader.java
@@ -22,7 +22,7 @@
package com.github.bartimaeusnek.bartworks.system.material.CircuitGeneration;
-import com.github.bartimaeusnek.ASM.BWCoreStaticReplacementMethodes;
+import com.github.bartimaeusnek.bartworks.ASM.BWCoreStaticReplacementMethodes;
import com.github.bartimaeusnek.bartworks.common.configs.ConfigHandler;
import com.github.bartimaeusnek.bartworks.system.material.WerkstoffLoader;
import com.github.bartimaeusnek.bartworks.util.BWRecipes;