Skip to content

Commit d61284f

Browse files
DetravDetrav
committed
- Fixed tic stackoverflow
Former-commit-id: 62bd7d9
1 parent 16bfae1 commit d61284f

7 files changed

Lines changed: 76 additions & 70 deletions

File tree

‎build.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
minecraft.version=1.7.10
22
forge.version=10.13.4.1566-1.7.10
33

4-
detravscanner.version=gt.9.31-0.44.0
4+
detravscanner.version=gt.9.31-0.47.0
55

66
ae2.version=rv2-beta-33
77
applecore.version=1.7.10-1.2.1+107.59407

‎src/main/java/com/detrav/DetravScannerMod.java‎

Lines changed: 5 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import com.detrav.utils.DetravConfig;
99
import com.detrav.utils.DetravCreativeTab;
1010
import com.detrav.net.DetravNetwork;
11+
import com.detrav.utils.Detrav_AfterGTPreload_Loader;
1112
import cpw.mods.fml.common.Mod;
1213
import cpw.mods.fml.common.Mod.EventHandler;
1314
import cpw.mods.fml.common.SidedProxy;
@@ -20,11 +21,11 @@
2021
import net.minecraft.creativetab.CreativeTabs;
2122
import net.minecraftforge.common.config.Configuration;
2223

23-
@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-after:gregtech")
24+
@Mod(modid = DetravScannerMod.MODID, version = DetravScannerMod.VERSION,dependencies = "required-after:IC2;required-before:gregtech")
2425
public class DetravScannerMod
2526
{
2627
public static final String MODID = "detravscannermod";
27-
public static final String VERSION = "0.44";
28+
public static final String VERSION = "0.47";
2829

2930
public static final CreativeTabs TAB_DETRAV = new DetravCreativeTab();
3031

@@ -36,7 +37,7 @@ public class DetravScannerMod
3637

3738
public DetravScannerMod()
3839
{
39-
40+
GregTech_API.sAfterGTPreload.add(new Detrav_AfterGTPreload_Loader());
4041
new DetravNetwork();
4142
}
4243

@@ -48,21 +49,8 @@ public void preLoad(FMLPreInitializationEvent event) {
4849
}
4950

5051
@EventHandler
51-
public void preInit(FMLPreInitializationEvent event) {
52-
proxy.onPreInit();
53-
}
54-
55-
@EventHandler
56-
public void init(FMLInitializationEvent event)
57-
{
58-
// some example code
59-
//System.out.println("DIRT BLOCK >> "+Blocks.dirt.getUnlocalizedName());
52+
public void onLoad(FMLInitializationEvent aEvent) {
6053
NetworkRegistry.INSTANCE.registerGuiHandler(instance, proxy );
61-
}
62-
63-
@EventHandler
64-
public void onLoad(FMLInitializationEvent aEvent)
65-
{
6654
proxy.onLoad();
6755
}
6856

‎src/main/java/com/detrav/events/DetravBlockBreakEventHandler.java‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,31 @@
2626
* Created by wital_000 on 13.04.2016.
2727
*/
2828
public class DetravBlockBreakEventHandler {
29+
30+
static String thisName = DetravBlockBreakEventHandler.class.getCanonicalName();
31+
2932
@SubscribeEvent
3033
public void onBreakBlock(BlockEvent.BreakEvent ev) {
3134
if (ev.isCanceled())
3235
return;
33-
if (ev instanceof DetravBlockBreakEvent)
34-
return;
36+
// if (ev instanceof DetravBlockBreakEvent)
37+
// return;
3538
if (!ev.world.isRemote) {
3639
EntityPlayer player = ev.getPlayer();
3740
if ((player instanceof EntityPlayerMP) && ((EntityPlayerMP) player).theItemInWorldManager.getGameType() != WorldSettings.GameType.SURVIVAL)
3841
return;
3942
if (player.capabilities.isCreativeMode)
4043
return;
44+
45+
46+
StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
47+
for (int i =2; i< stackTrace.length; i++) {
48+
//check for recursive
49+
if (stackTrace[i].getClassName().equals(thisName)) {
50+
return;
51+
}
52+
}
53+
4154
NBTTagCompound entityData = player.getEntityData();
4255
long minningMode = entityData.getLong("detrav.minning.mode");
4356
if (minningMode == 0) return;

‎src/main/java/com/detrav/proxies/ClientProxy.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ public void openProPickGui()
4141
//Minecraft.getMinecraft().thePlayer.addChatMessage(new ChatComponentText("NetworkTested: " + Integer.toString(level)));
4242
}
4343
@Override
44-
public void onPreInit()
44+
public void onPreLoad()
4545
{
46-
super.onPreInit();
46+
super.onPreLoad();
4747
DetravKeyHandler.register();
4848
}
4949

‎src/main/java/com/detrav/proxies/CommonProxy.java‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -136,41 +136,6 @@ public void openPortableAnvilGui(EntityPlayer player)
136136
}
137137

138138
public void onPreLoad()
139-
{
140-
141-
//items
142-
new DetravMetaGeneratedItem01();
143-
new DetravMetaGeneratedTool01();
144-
145-
//recipes and etc
146-
new ProcessingDetravToolProPick();
147-
new ProcessingDetravShaping();
148-
if (DetravConfig.PORTABLE_CHARGER_ENABLE)
149-
new ProcessingDetravPortableCharger();
150-
if(DetravConfig.SMART_PLUNGER_ENABLE)
151-
new ProcessingDetravSmartPlunger();
152-
//new Detrav_MetaGenerated_Tool_01();
153-
//new ProcessingDetravToolProPick();
154-
155-
if (DetravConfig.REPAIR_TOOL_ENABLE)
156-
GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, Materials.Iron, Materials._NULL, null)
157-
, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IBI", " I ", "III", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Iron), Character.valueOf('B'), OrePrefixes.block.get(Materials.Iron)});
158-
159-
//ItemList.Machine_Bronze_Boiler_Solar.set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L));
160-
if(DetravConfig.SOLAR_BOILERS_ENABLE) {
161-
162-
163-
DetravItemList.Solar_Boiler_Low.set(new Detrav_MetaTileEntity_Boiler_Solar_Low(2051, "boiler.bronze.solar", "Bronze Solar Boiler").getStackForm(1L));
164-
DetravItemList.Solar_Boiler_Medium.set(new Detrav_MetaTileEntity_Boiler_Solar_Medium(2052, "boiler.steel.solar", "Steel Solar Boiler").getStackForm(1L));
165-
DetravItemList.Solar_Boiler_High.set(new Detrav_MetaTileEntity_Boiler_Solar_High(2053, "boiler.stainless.steel.solar", "Stainless Steel Solar Boiler").getStackForm(1L));
166-
}
167-
//DetravItemList.Anvil.set()
168-
169-
// GameRegistry.addRecipe(new DetravRepairRecipe());
170-
}
171-
172-
173-
public void onPreInit()
174139
{
175140

176141
}

‎src/main/java/com/detrav/proxies/ServerProxy.java‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,5 @@
44
* Created by wital_000 on 19.03.2016.
55
*/
66
public class ServerProxy extends CommonProxy {
7-
@Override
8-
public void onPostLoad() {
9-
super.onPostLoad();
10-
}
117

12-
@Override
13-
public void onLoad() {
14-
super.onLoad();
15-
}
16-
17-
@Override
18-
public void onPreInit() {
19-
super.onPreInit();
20-
}
218
}

‎src/main/java/com/detrav/utils/Detrav_AfterGTPreload_Loader.java‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
package com.detrav.utils;
2+
3+
import com.detrav.enums.DetravItemList;
4+
import com.detrav.items.DetravMetaGeneratedItem01;
5+
import com.detrav.items.DetravMetaGeneratedTool01;
6+
import com.detrav.items.processing.ProcessingDetravPortableCharger;
7+
import com.detrav.items.processing.ProcessingDetravShaping;
8+
import com.detrav.items.processing.ProcessingDetravSmartPlunger;
9+
import com.detrav.items.processing.ProcessingDetravToolProPick;
10+
import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_High;
11+
import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_Low;
12+
import com.detrav.tileentities.Detrav_MetaTileEntity_Boiler_Solar_Medium;
13+
import gregtech.api.enums.Materials;
14+
import gregtech.api.enums.OrePrefixes;
15+
import gregtech.api.util.GT_ModHandler;
16+
17+
/**
18+
* Created by Detrav on 19.10.2017.
19+
*/
20+
public class Detrav_AfterGTPreload_Loader implements Runnable {
21+
@Override
22+
public void run() {
23+
24+
//items
25+
new DetravMetaGeneratedItem01();
26+
new DetravMetaGeneratedTool01();
27+
28+
//recipes and etc
29+
new ProcessingDetravToolProPick();
30+
new ProcessingDetravShaping();
31+
if (DetravConfig.PORTABLE_CHARGER_ENABLE)
32+
new ProcessingDetravPortableCharger();
33+
if(DetravConfig.SMART_PLUNGER_ENABLE)
34+
new ProcessingDetravSmartPlunger();
35+
//new Detrav_MetaGenerated_Tool_01();
36+
//new ProcessingDetravToolProPick();
37+
38+
if (DetravConfig.REPAIR_TOOL_ENABLE)
39+
GT_ModHandler.addCraftingRecipe(DetravMetaGeneratedTool01.INSTANCE.getToolWithStats(2, 1, Materials.Iron, Materials._NULL, null)
40+
, GT_ModHandler.RecipeBits.DISMANTLEABLE | GT_ModHandler.RecipeBits.DO_NOT_CHECK_FOR_COLLISIONS | GT_ModHandler.RecipeBits.BUFFERED, new Object[]{"IBI", " I ", "III", Character.valueOf('I'), OrePrefixes.ingot.get(Materials.Iron), Character.valueOf('B'), OrePrefixes.block.get(Materials.Iron)});
41+
42+
//ItemList.Machine_Bronze_Boiler_Solar.set(new GT_MetaTileEntity_Boiler_Solar(105, "boiler.solar", "Simple Solar Boiler").getStackForm(1L));
43+
if(DetravConfig.SOLAR_BOILERS_ENABLE) {
44+
45+
DetravItemList.Solar_Boiler_Low.set(new Detrav_MetaTileEntity_Boiler_Solar_Low(2051, "boiler.bronze.solar", "Bronze Solar Boiler").getStackForm(1L));
46+
DetravItemList.Solar_Boiler_Medium.set(new Detrav_MetaTileEntity_Boiler_Solar_Medium(2052, "boiler.steel.solar", "Steel Solar Boiler").getStackForm(1L));
47+
DetravItemList.Solar_Boiler_High.set(new Detrav_MetaTileEntity_Boiler_Solar_High(2053, "boiler.stainless.steel.solar", "Stainless Steel Solar Boiler").getStackForm(1L));
48+
}
49+
//DetravItemList.Anvil.set()
50+
51+
// GameRegistry.addRecipe(new DetravRepairRecipe());
52+
}
53+
}

0 commit comments

Comments
 (0)