Skip to content

Commit

Permalink
Updated to forge .98
Browse files Browse the repository at this point in the history
  • Loading branch information
Buuz135 committed Aug 1, 2020
1 parent 8aa7f5d commit 5bc4010
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 19 deletions.
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ repositories {
}

dependencies {
minecraft 'net.minecraftforge:forge:1.16.1-32.0.70'
minecraft 'net.minecraftforge:forge:1.16.1-32.0.98'
if (findProject(':titanium') != null) {
compile project(':titanium')
} else {
Expand All @@ -114,7 +114,7 @@ dependencies {
// at runtime, use the full JEI jar
runtimeOnly fg.deobf("mezz.jei:jei-1.16.1:7.0.0.2")
//}
compile fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:0.16-+")
compileOnly fg.deobf("blusunrize.immersiveengineering:ImmersiveEngineering:0.16-+")
}

afterEvaluate {
Expand Down
6 changes: 3 additions & 3 deletions src/main/java/com/buuz135/industrial/IndustrialForegoing.java
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@ public IndustrialForegoing() {
proxy = new CommonProxy();
DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> EventManager.mod(FMLClientSetupEvent.class).process(fmlClientSetupEvent -> new ClientProxy().run()).subscribe());
EventManager.mod(FMLCommonSetupEvent.class).process(fmlCommonSetupEvent -> proxy.run()).subscribe();
EventManager.mod(FMLServerStartingEvent.class).process(fmlServerStartingEvent -> worldFakePlayer.clear()).subscribe();
EventManager.mod(RegistryEvent.Register.class).filter(register -> register.getGenericType().equals(IRecipeSerializer.class))
.process(register -> register.getRegistry().registerAll(FluidExtractorRecipe.SERIALIZER, DissolutionChamberRecipe.SERIALIZER)).subscribe();
EventManager.forge(FMLServerStartingEvent.class).process(fmlServerStartingEvent -> worldFakePlayer.clear()).subscribe();
EventManager.modGeneric(RegistryEvent.Register.class, IRecipeSerializer.class)
.process(register -> ((RegistryEvent.Register) register).getRegistry().registerAll(FluidExtractorRecipe.SERIALIZER, DissolutionChamberRecipe.SERIALIZER)).subscribe();
IFRegistries.poke();
RewardGiver giver = RewardManager.get().getGiver(UUID.fromString("d28b7061-fb92-4064-90fb-7e02b95a72a6"), "Buuz135");
try {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ public List<Feature.Builder> generateFeatures() {
features.add(Feature.builder("fertilizer").
content(Item.class, FERTILIZER));
features.add(Feature.builder("straw").
event(EventManager.mod(RegistryEvent.Register.class).filter(register -> register.getGenericType().equals(StrawHandler.class)).process(StrawRegistry::register)).
event(EventManager.modGeneric(RegistryEvent.Register.class, StrawHandler.class).process(register -> StrawRegistry.register((RegistryEvent.Register<StrawHandler>) register))).
content(Item.class, STRAW));
features.add(Feature.builder("machine_frames").
content(Block.class, PITY).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ public class ImmersiveEngineeringPlugin implements FeaturePluginInstance {
@Override
public void execute(PluginPhase phase) {
if (phase == PluginPhase.CONSTRUCTION) {
EventManager.mod(RegistryEvent.Register.class).filter(register -> register.getGenericType().equals(PlantRecollectable.class)).process(register -> {
register.getRegistry().register(new HempPlantRecollectable());
EventManager.modGeneric(RegistryEvent.Register.class, PlantRecollectable.class).process(register -> {
((RegistryEvent.Register) register).getRegistry().register(new HempPlantRecollectable());
}).subscribe();
}
}
Expand Down
29 changes: 18 additions & 11 deletions src/main/resources/META-INF/mods.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,37 @@
# Note that there are a couple of TOML lists in this file.
# Find more information on toml format here: https://github.com/toml-lang/toml
# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
modLoader="javafml" #mandatory
modLoader = "javafml" #mandatory
# A version range to match for said mod loader - for regular FML @Mod it will be the minecraft version (without the 1.)
loaderVersion="[28,)" #mandatory
loaderVersion = "[32,)" #mandatory
license = "MIT"
# A URL to refer people to when problems occur with this mod

# A URL for the "homepage" for this mod, displayed in the mod UI

# A text field displayed in the mod UI
authors="Buuz135" #optional
authors = "Buuz135" #optional
# A list of mods - how many allowed here is determined by the individual mod loader
[[mods]] #mandatory
# The modid of the mod
modId="industrialforegoing" #mandatory
modId = "industrialforegoing" #mandatory
# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
version="${file.jarVersion}" #mandatory
# A display name for the mod
displayName="Industrial Foregoing" #mandatory
displayName = "Industrial Foregoing" #mandatory
# The description text for the mod (multi line!) (#mandatory)
description='''
description = '''
IF: You need to automate all the things
'''
[[dependencies.industrialforegoing]] #optional
modId="titanium" #mandatory
mandatory=true #mandatory
versionRange="[2.2.9,)" #mandatory
ordering="NONE"
side="BOTH"
modId = "titanium" #mandatory
mandatory = true #mandatory
versionRange = "[2.2.9,)" #mandatory
ordering = "NONE"
side = "BOTH"
[[dependencies.industrialforegoing]] #optional
modId = "forge" #mandatory
mandatory = true #mandatory
versionRange = "[32.0.98,)" #mandatory
ordering = "NONE"
side = "BOTH"

0 comments on commit 5bc4010

Please sign in to comment.