Skip to content

Commit 3466845

Browse files
tier940tier940
committed
temp fix recipe property
1 parent 27589e4 commit 3466845

186 files changed

Lines changed: 19170 additions & 19287 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎libs/GregicalityMultiblocks-1.3.0-dev.jar‎

953 Bytes
Binary file not shown.

‎src/main/java/gtexpert/GTExpertMod.java‎

Lines changed: 179 additions & 179 deletions
Original file line numberDiff line numberDiff line change
@@ -1,179 +1,179 @@
1-
package gtexpert;
2-
3-
import java.util.function.Function;
4-
5-
import net.minecraft.block.Block;
6-
import net.minecraft.item.Item;
7-
import net.minecraft.item.ItemBlock;
8-
import net.minecraft.item.crafting.IRecipe;
9-
import net.minecraft.util.ResourceLocation;
10-
import net.minecraftforge.common.MinecraftForge;
11-
import net.minecraftforge.common.config.Config;
12-
import net.minecraftforge.common.config.ConfigManager;
13-
import net.minecraftforge.event.RegistryEvent;
14-
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
15-
import net.minecraftforge.fml.common.Loader;
16-
import net.minecraftforge.fml.common.Mod;
17-
import net.minecraftforge.fml.common.event.*;
18-
import net.minecraftforge.fml.common.eventhandler.EventPriority;
19-
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
20-
21-
import gregtech.GTInternalTags;
22-
import gregtech.api.GregTechAPI;
23-
import gregtech.api.cover.CoverDefinition;
24-
25-
import gtexpert.api.GTEValues;
26-
import gtexpert.api.util.GTELog;
27-
import gtexpert.api.util.Mods;
28-
import gtexpert.common.items.behaviors.GTECoverBehaviors;
29-
import gtexpert.modules.GTEModuleManager;
30-
import gtexpert.modules.GTEModules;
31-
32-
@Mod(modid = GTEValues.MODID,
33-
name = GTEValues.MODNAME,
34-
acceptedMinecraftVersions = "[1.12.2,1.13)",
35-
version = Tags.VERSION,
36-
updateJSON = "https://forge.curseupdate.com/851103/gtexpert",
37-
dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MODULRAUI + ";" +
38-
"required-after:" + Mods.Names.MIXINBOOTER + ";" +
39-
"required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
40-
"after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" +
41-
"after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" +
42-
"after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" +
43-
"after:" + Mods.Names.ENDER_CORE + ";" + "after:" + Mods.Names.ENDER_IO + ";" +
44-
"after:" + Mods.Names.ENDER_ENDERGY + ";" + "after:" + Mods.Names.ENDER_MACHINES + ";" +
45-
"after:" + Mods.Names.ENDER_CONDUITS + ";" + "after:" + Mods.Names.ENDER_AE2_CONDUITS + ";" +
46-
"after:" + Mods.Names.DRACONIC_EVOLUTION + ";" + "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" +
47-
"after:" + Mods.Names.CHISEL + ";" + "after:" + Mods.Names.AVARITIA + ";" +
48-
"after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";" +
49-
"after:" + Mods.Names.FORESTRY + ";" + "after:" + Mods.Names.GENDUSTRY + ";" +
50-
"after:" + Mods.Names.GENETICS + ";" + "after:" + Mods.Names.BOTANY + ";" +
51-
"after:" + Mods.Names.EXTRA_BEES + ";" + "after:" + Mods.Names.EXTRA_TREES + ";")
52-
@Mod.EventBusSubscriber(modid = GTEValues.MODID)
53-
public class GTExpertMod {
54-
55-
private GTEModuleManager moduleManager;
56-
57-
@Mod.EventHandler
58-
public void onConstruction(FMLConstructionEvent event) {
59-
MinecraftForge.EVENT_BUS.register(this);
60-
GTELog.logger.info("starting construction event...");
61-
moduleManager = GTEModuleManager.getInstance();
62-
moduleManager.registerContainer(new GTEModules());
63-
moduleManager.setup(event.getASMHarvestedData(), Loader.instance().getConfigDir());
64-
moduleManager.onConstruction(event);
65-
GTELog.logger.info("finished construction!");
66-
}
67-
68-
@Mod.EventHandler
69-
public void preInit(FMLPreInitializationEvent event) {
70-
moduleManager.onPreInit(event);
71-
}
72-
73-
@Mod.EventHandler
74-
public void init(FMLInitializationEvent event) {
75-
moduleManager.onInit(event);
76-
}
77-
78-
@Mod.EventHandler
79-
public void postInit(FMLPostInitializationEvent event) {
80-
moduleManager.onPostInit(event);
81-
}
82-
83-
@Mod.EventHandler
84-
public void loadComplete(FMLLoadCompleteEvent event) {
85-
moduleManager.onLoadComplete(event);
86-
}
87-
88-
@Mod.EventHandler
89-
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
90-
moduleManager.onServerAboutToStart(event);
91-
}
92-
93-
@Mod.EventHandler
94-
public void serverStarting(FMLServerStartingEvent event) {
95-
moduleManager.onServerStarting(event);
96-
}
97-
98-
@Mod.EventHandler
99-
public void serverStarted(FMLServerStartedEvent event) {
100-
moduleManager.onServerStarted(event);
101-
}
102-
103-
@Mod.EventHandler
104-
public void serverStopping(FMLServerStoppingEvent event) {
105-
moduleManager.onServerStopping(event);
106-
}
107-
108-
@Mod.EventHandler
109-
public void serverStopped(FMLServerStoppedEvent event) {
110-
moduleManager.onServerStopped(event);
111-
}
112-
113-
@Mod.EventHandler
114-
public void respondIMC(FMLInterModComms.IMCEvent event) {
115-
moduleManager.processIMC(event.getMessages());
116-
}
117-
118-
@SubscribeEvent
119-
public void registerBlocks(RegistryEvent.Register<Block> event) {
120-
GTELog.logger.info("Registering Blocks...");
121-
moduleManager.registerBlocks(event);
122-
}
123-
124-
@SubscribeEvent
125-
public void registerItems(RegistryEvent.Register<Item> event) {
126-
GTELog.logger.info("Registering Items...");
127-
128-
moduleManager.registerItems(event);
129-
}
130-
131-
@SubscribeEvent
132-
public static void registerCovers(GregTechAPI.RegisterEvent<CoverDefinition> event) {
133-
GTELog.logger.info("Registering Covers...");
134-
GTECoverBehaviors.init();
135-
}
136-
137-
@SubscribeEvent(priority = EventPriority.HIGHEST)
138-
public void registerRecipesHighest(RegistryEvent.Register<IRecipe> event) {
139-
moduleManager.registerRecipesHighest(event);
140-
}
141-
142-
@SubscribeEvent(priority = EventPriority.HIGH)
143-
public void registerRecipesHigh(RegistryEvent.Register<IRecipe> event) {
144-
moduleManager.registerRecipesHigh(event);
145-
}
146-
147-
@SubscribeEvent(priority = EventPriority.NORMAL)
148-
public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
149-
moduleManager.registerRecipesNormal(event);
150-
}
151-
152-
@SubscribeEvent(priority = EventPriority.LOW)
153-
public void registerRecipesLow(RegistryEvent.Register<IRecipe> event) {
154-
moduleManager.registerRecipesLow(event);
155-
}
156-
157-
@SubscribeEvent(priority = EventPriority.LOWEST)
158-
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
159-
moduleManager.registerRecipesLowest(event);
160-
}
161-
162-
public static <T extends Block> ItemBlock createItemBlock(T block, Function<T, ItemBlock> producer) {
163-
ItemBlock itemBlock = producer.apply(block);
164-
ResourceLocation registryName = block.getRegistryName();
165-
if (registryName == null) {
166-
GTELog.logger.error("Block has no registry name: {}", block.getTranslationKey(), new Throwable());
167-
} else {
168-
itemBlock.setRegistryName(registryName);
169-
}
170-
return itemBlock;
171-
}
172-
173-
@SubscribeEvent
174-
public static void syncConfigValues(ConfigChangedEvent.OnConfigChangedEvent event) {
175-
if (event.getModID().equals(GTEValues.MODID)) {
176-
ConfigManager.sync(GTEValues.MODID, Config.Type.INSTANCE);
177-
}
178-
}
179-
}
1+
package gtexpert;
2+
3+
import java.util.function.Function;
4+
5+
import net.minecraft.block.Block;
6+
import net.minecraft.item.Item;
7+
import net.minecraft.item.ItemBlock;
8+
import net.minecraft.item.crafting.IRecipe;
9+
import net.minecraft.util.ResourceLocation;
10+
import net.minecraftforge.common.MinecraftForge;
11+
import net.minecraftforge.common.config.Config;
12+
import net.minecraftforge.common.config.ConfigManager;
13+
import net.minecraftforge.event.RegistryEvent;
14+
import net.minecraftforge.fml.client.event.ConfigChangedEvent;
15+
import net.minecraftforge.fml.common.Loader;
16+
import net.minecraftforge.fml.common.Mod;
17+
import net.minecraftforge.fml.common.event.*;
18+
import net.minecraftforge.fml.common.eventhandler.EventPriority;
19+
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
20+
21+
import gregtech.GTInternalTags;
22+
import gregtech.api.GregTechAPI;
23+
import gregtech.api.cover.CoverDefinition;
24+
25+
import gtexpert.api.GTEValues;
26+
import gtexpert.api.util.GTELog;
27+
import gtexpert.api.util.Mods;
28+
import gtexpert.common.items.behaviors.GTECoverBehaviors;
29+
import gtexpert.modules.GTEModuleManager;
30+
import gtexpert.modules.GTEModules;
31+
32+
@Mod(modid = GTEValues.MODID,
33+
name = GTEValues.MODNAME,
34+
acceptedMinecraftVersions = "[1.12.2,1.13)",
35+
version = Tags.VERSION,
36+
updateJSON = "https://forge.curseupdate.com/851103/gtexpert",
37+
dependencies = GTInternalTags.DEP_VERSION_STRING + "required-after:" + Mods.Names.MODULRAUI + ";" +
38+
"required-after:" + Mods.Names.MIXINBOOTER + ";" +
39+
"required-after:" + Mods.Names.GREGICALITY_MULTIBLOCKS + ";" +
40+
"after:" + Mods.Names.GREGTECH_FOOD_OPTION + ";" + "after:" + Mods.Names.APPLIED_ENERGISTICS2 + ";" +
41+
"after:" + Mods.Names.AE_ADDITIONS + ";" + "after:" + Mods.Names.AE2_FLUID_CRAFTING + ";" +
42+
"after:" + Mods.Names.NEEVES_AE2 + ";" + "after:" + Mods.Names.EXTRA_CPUS + ";" +
43+
"after:" + Mods.Names.ENDER_CORE + ";" + "after:" + Mods.Names.ENDER_IO + ";" +
44+
"after:" + Mods.Names.ENDER_ENDERGY + ";" + "after:" + Mods.Names.ENDER_MACHINES + ";" +
45+
"after:" + Mods.Names.ENDER_CONDUITS + ";" + "after:" + Mods.Names.ENDER_AE2_CONDUITS + ";" +
46+
"after:" + Mods.Names.DRACONIC_EVOLUTION + ";" + "after:" + Mods.Names.DRACONIC_ADDITIONS + ";" +
47+
"after:" + Mods.Names.CHISEL + ";" + "after:" + Mods.Names.AVARITIA + ";" +
48+
"after:" + Mods.Names.THAUMCRAFT + ";" + "after:" + Mods.Names.THAUMIC_ENERGISTICS + ";" +
49+
"after:" + Mods.Names.FORESTRY + ";" + "after:" + Mods.Names.GENDUSTRY + ";" +
50+
"after:" + Mods.Names.GENETICS + ";" + "after:" + Mods.Names.BOTANY + ";" +
51+
"after:" + Mods.Names.EXTRA_BEES + ";" + "after:" + Mods.Names.EXTRA_TREES + ";")
52+
@Mod.EventBusSubscriber(modid = GTEValues.MODID)
53+
public class GTExpertMod {
54+
55+
private GTEModuleManager moduleManager;
56+
57+
@Mod.EventHandler
58+
public void onConstruction(FMLConstructionEvent event) {
59+
MinecraftForge.EVENT_BUS.register(this);
60+
GTELog.logger.info("starting construction event...");
61+
moduleManager = GTEModuleManager.getInstance();
62+
moduleManager.registerContainer(new GTEModules());
63+
moduleManager.setup(event.getASMHarvestedData(), Loader.instance().getConfigDir());
64+
moduleManager.onConstruction(event);
65+
GTELog.logger.info("finished construction!");
66+
}
67+
68+
@Mod.EventHandler
69+
public void preInit(FMLPreInitializationEvent event) {
70+
moduleManager.onPreInit(event);
71+
}
72+
73+
@Mod.EventHandler
74+
public void init(FMLInitializationEvent event) {
75+
moduleManager.onInit(event);
76+
}
77+
78+
@Mod.EventHandler
79+
public void postInit(FMLPostInitializationEvent event) {
80+
moduleManager.onPostInit(event);
81+
}
82+
83+
@Mod.EventHandler
84+
public void loadComplete(FMLLoadCompleteEvent event) {
85+
moduleManager.onLoadComplete(event);
86+
}
87+
88+
@Mod.EventHandler
89+
public void serverAboutToStart(FMLServerAboutToStartEvent event) {
90+
moduleManager.onServerAboutToStart(event);
91+
}
92+
93+
@Mod.EventHandler
94+
public void serverStarting(FMLServerStartingEvent event) {
95+
moduleManager.onServerStarting(event);
96+
}
97+
98+
@Mod.EventHandler
99+
public void serverStarted(FMLServerStartedEvent event) {
100+
moduleManager.onServerStarted(event);
101+
}
102+
103+
@Mod.EventHandler
104+
public void serverStopping(FMLServerStoppingEvent event) {
105+
moduleManager.onServerStopping(event);
106+
}
107+
108+
@Mod.EventHandler
109+
public void serverStopped(FMLServerStoppedEvent event) {
110+
moduleManager.onServerStopped(event);
111+
}
112+
113+
@Mod.EventHandler
114+
public void respondIMC(FMLInterModComms.IMCEvent event) {
115+
moduleManager.processIMC(event.getMessages());
116+
}
117+
118+
@SubscribeEvent
119+
public void registerBlocks(RegistryEvent.Register<Block> event) {
120+
GTELog.logger.info("Registering Blocks...");
121+
moduleManager.registerBlocks(event);
122+
}
123+
124+
@SubscribeEvent
125+
public void registerItems(RegistryEvent.Register<Item> event) {
126+
GTELog.logger.info("Registering Items...");
127+
128+
moduleManager.registerItems(event);
129+
}
130+
131+
@SubscribeEvent
132+
public static void registerCovers(GregTechAPI.RegisterEvent<CoverDefinition> event) {
133+
GTELog.logger.info("Registering Covers...");
134+
GTECoverBehaviors.init();
135+
}
136+
137+
@SubscribeEvent(priority = EventPriority.HIGHEST)
138+
public void registerRecipesHighest(RegistryEvent.Register<IRecipe> event) {
139+
moduleManager.registerRecipesHighest(event);
140+
}
141+
142+
@SubscribeEvent(priority = EventPriority.HIGH)
143+
public void registerRecipesHigh(RegistryEvent.Register<IRecipe> event) {
144+
moduleManager.registerRecipesHigh(event);
145+
}
146+
147+
@SubscribeEvent(priority = EventPriority.NORMAL)
148+
public void registerRecipes(RegistryEvent.Register<IRecipe> event) {
149+
moduleManager.registerRecipesNormal(event);
150+
}
151+
152+
@SubscribeEvent(priority = EventPriority.LOW)
153+
public void registerRecipesLow(RegistryEvent.Register<IRecipe> event) {
154+
moduleManager.registerRecipesLow(event);
155+
}
156+
157+
@SubscribeEvent(priority = EventPriority.LOWEST)
158+
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
159+
moduleManager.registerRecipesLowest(event);
160+
}
161+
162+
public static <T extends Block> ItemBlock createItemBlock(T block, Function<T, ItemBlock> producer) {
163+
ItemBlock itemBlock = producer.apply(block);
164+
ResourceLocation registryName = block.getRegistryName();
165+
if (registryName == null) {
166+
GTELog.logger.error("Block has no registry name: {}", block.getTranslationKey(), new Throwable());
167+
} else {
168+
itemBlock.setRegistryName(registryName);
169+
}
170+
return itemBlock;
171+
}
172+
173+
@SubscribeEvent
174+
public static void syncConfigValues(ConfigChangedEvent.OnConfigChangedEvent event) {
175+
if (event.getModID().equals(GTEValues.MODID)) {
176+
ConfigManager.sync(GTEValues.MODID, Config.Type.INSTANCE);
177+
}
178+
}
179+
}

0 commit comments

Comments
 (0)