Skip to content

Commit 25babe3

Browse files
committed
Fix recycling logc.
1 parent f7b9571 commit 25babe3

24 files changed

Lines changed: 260 additions & 3 deletions

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# v1.2.5
2+
- Fix recycling logc.
3+
4+
* * *
5+
16
# v1.2.4
27
- Fix wood recycling recipe [#21](https://github.com/GTModpackTeam/GTWoodProcessing/pull/21)
38

src/main/java/com/github/gtexpert/gtwp/core/CoreModule.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import org.jetbrains.annotations.NotNull;
2222

2323
import gregtech.api.block.VariantItemBlock;
24-
import gregtech.loaders.recipe.RecyclingRecipes;
2524

2625
import com.github.gtexpert.gtwp.Tags;
2726
import com.github.gtexpert.gtwp.api.ModValues;
@@ -100,6 +99,5 @@ public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
10099
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
101100
GTWPRecipe.init();
102101
GTWPWoodRecipe.init();
103-
RecyclingRecipes.init();
104102
}
105103
}

src/main/java/com/github/gtexpert/gtwp/integration/advrocketry/AdvancedRocketryModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.advrocketry;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Advanced Rocketry Integration Module")
1924
public class AdvancedRocketryModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(AdvancedRocketryModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
AdvancedRocketryWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/binnies/extratrees/ExtraTreesModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.binnies.extratrees;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Extra Trees(Binnie's Mods) Integration Module")
1924
public class ExtraTreesModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(ExtraTreesModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
ExtraTreesWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/bop/BoPModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.bop;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Biomes O' Plenty Integration Module")
1924
public class BoPModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(BoPModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
BoPWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/botania/BotaniaModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.botania;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Botania Integration Module")
1924
public class BotaniaModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(BotaniaModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
BotaniaWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/exu/ExUModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.exu;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Extra Utilities 2 Integration Module")
1924
public class ExUModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(ExUModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
ExUWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/forestry/ForestryModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.forestry;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Forestry Integration Module")
1924
public class ForestryModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(ForestryModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
ForestryWoodRecipe.init();

src/main/java/com/github/gtexpert/gtwp/integration/gtfo/GTFOModule.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.gtfo;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,8 +23,14 @@
1823
description = "GregTech Food Option Integration Module")
1924
public class GTFOModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(GTFOModule.class);
30+
}
31+
2132
@Override
22-
public void registerRecipesLowest(RegistryEvent.Register<IRecipe> event) {
33+
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
GTFOWoodRecipe.init();
2435
}
2536
}

src/main/java/com/github/gtexpert/gtwp/integration/iaf/IaFModule.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
package com.github.gtexpert.gtwp.integration.iaf;
22

3+
import java.util.Collections;
4+
import java.util.List;
5+
36
import net.minecraft.item.crafting.IRecipe;
47
import net.minecraftforge.event.RegistryEvent;
58

9+
import org.jetbrains.annotations.NotNull;
10+
611
import com.github.gtexpert.gtwp.api.ModValues;
712
import com.github.gtexpert.gtwp.api.modules.TModule;
813
import com.github.gtexpert.gtwp.api.util.Mods;
@@ -18,6 +23,12 @@
1823
description = "Ice and Fire: Dragons Integration Module")
1924
public class IaFModule extends GTWPIntegrationSubmodule {
2025

26+
@NotNull
27+
@Override
28+
public List<Class<?>> getEventBusSubscribers() {
29+
return Collections.singletonList(IaFModule.class);
30+
}
31+
2132
@Override
2233
public void registerRecipesNormal(RegistryEvent.Register<IRecipe> event) {
2334
IaFWoodRecipe.init();

0 commit comments

Comments
 (0)