Skip to content

Commit 85ca0de

Browse files
Shadowbee27Shadowbee27
committed
Fixed some noeforge errors
1 parent 32dc741 commit 85ca0de

File tree

19 files changed

+890
-440
lines changed

19 files changed

+890
-440
lines changed

‎common/src/main/java/org/modsauce/otyacraftenginerenewed/data/CrossDataGeneratorAccess.java‎

Lines changed: 141 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
package org.modsauce.otyacraftenginerenewed.data;
22

33
import dev.architectury.platform.Mod;
4+
import java.nio.file.Path;
5+
import java.util.Collection;
6+
import java.util.List;
7+
import java.util.concurrent.CompletableFuture;
8+
import java.util.concurrent.atomic.AtomicReference;
9+
import java.util.function.BiFunction;
410
import net.minecraft.core.HolderLookup;
511
import net.minecraft.core.RegistrySetBuilder;
612
import net.minecraft.data.DataGenerator;
@@ -18,25 +24,33 @@
1824
import org.jetbrains.annotations.NotNull;
1925
import org.modsauce.otyacraftenginerenewed.data.provider.*;
2026

21-
import java.nio.file.Path;
22-
import java.util.Collection;
23-
import java.util.List;
24-
import java.util.concurrent.CompletableFuture;
25-
import java.util.concurrent.atomic.AtomicReference;
26-
import java.util.function.BiFunction;
27-
2827
public interface CrossDataGeneratorAccess {
29-
@NotNull DataGenerator getVanillaGenerator();
30-
31-
<T extends DataProvider> T addProvider(@NotNull DataProvider.Factory<T> factory);
32-
33-
<T extends DataProvider> T addProvider(@NotNull BiFunction<PackOutput, CompletableFuture<HolderLookup.Provider>, T> dataProviderSupplier);
34-
35-
default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataProviderWrapper.GeneratorAccessedFactory<T> factory) {
36-
return addProviderWrapper(packOutput -> factory.create(packOutput, CrossDataGeneratorAccess.this));
28+
@NotNull
29+
DataGenerator getVanillaGenerator();
30+
31+
<T extends DataProvider> T addProvider(
32+
@NotNull DataProvider.Factory<T> factory
33+
);
34+
35+
<T extends DataProvider> T addProvider(
36+
@NotNull BiFunction<
37+
PackOutput,
38+
CompletableFuture<HolderLookup.Provider>,
39+
T
40+
> dataProviderSupplier
41+
);
42+
43+
default <T extends DataProviderWrapper<?>> T addProviderWrapper(
44+
@NotNull DataProviderWrapper.GeneratorAccessedFactory<T> factory
45+
) {
46+
return addProviderWrapper(packOutput ->
47+
factory.create(packOutput, CrossDataGeneratorAccess.this)
48+
);
3749
}
3850

39-
default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataProviderWrapper.Factory<T> factory) {
51+
default <T extends DataProviderWrapper<?>> T addProviderWrapper(
52+
@NotNull DataProviderWrapper.Factory<T> factory
53+
) {
4054
AtomicReference<T> providerWrapper = new AtomicReference<>();
4155

4256
addProvider(packOutput -> {
@@ -47,11 +61,18 @@ default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataPro
4761
return providerWrapper.get();
4862
}
4963

50-
default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataProviderWrapper.LookupGeneratorAccessedFactory<T> factory) {
51-
return addProviderWrapper((DataProviderWrapper.LookupFactory<T>) (packOutput, lookup) -> factory.create(packOutput, lookup, CrossDataGeneratorAccess.this));
64+
default <T extends DataProviderWrapper<?>> T addProviderWrapper(
65+
@NotNull DataProviderWrapper.LookupGeneratorAccessedFactory<T> factory
66+
) {
67+
return addProviderWrapper(
68+
(DataProviderWrapper.LookupFactory<T>) (packOutput, lookup) ->
69+
factory.create(packOutput, lookup, CrossDataGeneratorAccess.this)
70+
);
5271
}
5372

54-
default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataProviderWrapper.LookupFactory<T> factory) {
73+
default <T extends DataProviderWrapper<?>> T addProviderWrapper(
74+
@NotNull DataProviderWrapper.LookupFactory<T> factory
75+
) {
5576
AtomicReference<T> providerWrapper = new AtomicReference<>();
5677

5778
addProvider((packOutput, lookup) -> {
@@ -64,31 +85,113 @@ default <T extends DataProviderWrapper<?>> T addProviderWrapper(@NotNull DataPro
6485

6586
Mod getMod();
6687

67-
RecipeProvider createRecipeProvider(PackOutput packOutput, RecipeProviderWrapper recipeProviderWrapper);
68-
69-
TagsProvider<Item> createItemTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, ItemTagProviderWrapper itemTagProviderWrapper, @NotNull BlockTagProviderWrapper blockTagProviderWrapper);
70-
71-
TagsProvider<Fluid> createFluidTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, FluidTagProviderWrapper fluidTagProviderWrapper);
72-
73-
TagsProvider<Block> createBlockTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, BlockTagProviderWrapper blockTagProviderWrapper);
74-
75-
TagsProvider<PoiType> createPoiTypeTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, PoiTypeTagProviderWrapper poiTypeTagProviderWrapper);
76-
77-
TagsProvider<DamageType> createDamageTypeTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, DamageTypeTagsProviderWrapper damageTypeTagsProviderWrapper);
88+
// New 1.21.1 methods with registry lookup
89+
RecipeProvider createRecipeProvider(
90+
PackOutput packOutput,
91+
CompletableFuture<HolderLookup.Provider> lookup,
92+
RecipeProviderWrapper recipeProviderWrapper
93+
);
94+
95+
// Backward compatibility methods
96+
default RecipeProvider createRecipeProvider(
97+
PackOutput packOutput,
98+
RecipeProviderWrapper recipeProviderWrapper
99+
) {
100+
// For backward compatibility, use null lookup - implementations should handle this
101+
return createRecipeProvider(packOutput, null, recipeProviderWrapper);
102+
}
78103

79-
TagsProvider<Biome> createBiomeTagProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, BiomeTagsProviderWrapper biomeTagsProviderWrapper);
104+
TagsProvider<Item> createItemTagProvider(
105+
PackOutput packOutput,
106+
CompletableFuture<HolderLookup.Provider> lookup,
107+
ItemTagProviderWrapper itemTagProviderWrapper,
108+
@NotNull BlockTagProviderWrapper blockTagProviderWrapper
109+
);
110+
111+
TagsProvider<Fluid> createFluidTagProvider(
112+
PackOutput packOutput,
113+
CompletableFuture<HolderLookup.Provider> lookup,
114+
FluidTagProviderWrapper fluidTagProviderWrapper
115+
);
116+
117+
TagsProvider<Block> createBlockTagProvider(
118+
PackOutput packOutput,
119+
CompletableFuture<HolderLookup.Provider> lookup,
120+
BlockTagProviderWrapper blockTagProviderWrapper
121+
);
122+
123+
TagsProvider<PoiType> createPoiTypeTagProvider(
124+
PackOutput packOutput,
125+
CompletableFuture<HolderLookup.Provider> lookup,
126+
PoiTypeTagProviderWrapper poiTypeTagProviderWrapper
127+
);
128+
129+
TagsProvider<DamageType> createDamageTypeTagProvider(
130+
PackOutput packOutput,
131+
CompletableFuture<HolderLookup.Provider> lookup,
132+
DamageTypeTagsProviderWrapper damageTypeTagsProviderWrapper
133+
);
134+
135+
TagsProvider<Biome> createBiomeTagProvider(
136+
PackOutput packOutput,
137+
CompletableFuture<HolderLookup.Provider> lookup,
138+
BiomeTagsProviderWrapper biomeTagsProviderWrapper
139+
);
80140

81141
DataProvider createBasicProvider(BasicProviderWrapper basicProviderWrapper);
82142

83-
DataProvider createBlockLootTableProvider(PackOutput packOutput, BlockLootTableProviderWrapper blockLootTableProviderWrapper);
84-
85-
DataProvider createAdvancementProvider(PackOutput packOutput, AdvancementProviderWrapper advancementProviderWrapper, List<AdvancementSubProviderWrapper> subProviderWrappers);
86-
87-
DataProvider createItemModelProvider(PackOutput packOutput, ItemModelProviderWrapper itemModelProviderWrapper);
143+
DataProvider createBlockLootTableProvider(
144+
PackOutput packOutput,
145+
CompletableFuture<HolderLookup.Provider> lookup,
146+
BlockLootTableProviderWrapper blockLootTableProviderWrapper
147+
);
148+
149+
default DataProvider createBlockLootTableProvider(
150+
PackOutput packOutput,
151+
BlockLootTableProviderWrapper blockLootTableProviderWrapper
152+
) {
153+
return createBlockLootTableProvider(
154+
packOutput,
155+
null,
156+
blockLootTableProviderWrapper
157+
);
158+
}
88159

89-
DataProvider createBlockStateAndModelProvider(PackOutput packOutput, BlockStateAndModelProviderWrapper blockStateAndModelProviderWrapper);
160+
DataProvider createAdvancementProvider(
161+
PackOutput packOutput,
162+
CompletableFuture<HolderLookup.Provider> lookup,
163+
AdvancementProviderWrapper advancementProviderWrapper,
164+
List<AdvancementSubProviderWrapper> subProviderWrappers
165+
);
166+
167+
default DataProvider createAdvancementProvider(
168+
PackOutput packOutput,
169+
AdvancementProviderWrapper advancementProviderWrapper,
170+
List<AdvancementSubProviderWrapper> subProviderWrappers
171+
) {
172+
return createAdvancementProvider(
173+
packOutput,
174+
null,
175+
advancementProviderWrapper,
176+
subProviderWrappers
177+
);
178+
}
90179

91-
RegistriesDatapackGenerator createRegistriesDatapackGenerator(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> lookup, RegistrySetBuilder registrySetBuilder);
180+
DataProvider createItemModelProvider(
181+
PackOutput packOutput,
182+
ItemModelProviderWrapper itemModelProviderWrapper
183+
);
184+
185+
DataProvider createBlockStateAndModelProvider(
186+
PackOutput packOutput,
187+
BlockStateAndModelProviderWrapper blockStateAndModelProviderWrapper
188+
);
189+
190+
RegistriesDatapackGenerator createRegistriesDatapackGenerator(
191+
PackOutput packOutput,
192+
CompletableFuture<HolderLookup.Provider> lookup,
193+
RegistrySetBuilder registrySetBuilder
194+
);
92195

93196
Collection<Path> getResourceInputFolders();
94197

‎fabric/src/main/java/org/modsauce/otyacraftenginerenewed/explatform/client/fabric/OEClientExpectPlatformImpl.java‎

Lines changed: 31 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,48 @@
11
package org.modsauce.otyacraftenginerenewed.explatform.client.fabric;
22

33
import com.mojang.blaze3d.platform.InputConstants;
4-
import org.modsauce.otyacraftenginerenewed.client.renderer.item.BEWLItemRenderer;
5-
import org.modsauce.otyacraftenginerenewed.client.util.OERenderUtils;
6-
import org.modsauce.otyacraftenginerenewed.fabric.mixin.client.MinecraftAccessor;
74
import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
8-
import net.fabricmc.fabric.api.client.model.BakedModelManagerHelper;
95
import net.fabricmc.fabric.api.client.rendering.v1.BuiltinItemRendererRegistry;
106
import net.minecraft.client.KeyMapping;
117
import net.minecraft.client.Minecraft;
128
import net.minecraft.client.resources.model.BakedModel;
139
import net.minecraft.resources.ResourceLocation;
1410
import net.minecraft.world.level.ItemLike;
11+
import org.modsauce.otyacraftenginerenewed.client.renderer.item.BEWLItemRenderer;
12+
import org.modsauce.otyacraftenginerenewed.client.util.OERenderUtils;
1513

1614
public class OEClientExpectPlatformImpl {
17-
private static final Minecraft mc = Minecraft.getInstance();
1815

19-
public static InputConstants.Key getKey(KeyMapping key) {
20-
return KeyBindingHelper.getBoundKeyOf(key);
21-
}
16+
private static final Minecraft mc = Minecraft.getInstance();
17+
18+
public static InputConstants.Key getKey(KeyMapping key) {
19+
return KeyBindingHelper.getBoundKeyOf(key);
20+
}
2221

23-
public static BakedModel getModel(ResourceLocation location) {
24-
return BakedModelManagerHelper.getModel(mc.getModelManager(), location);
25-
}
22+
public static BakedModel getModel(ResourceLocation location) {
23+
return mc.getModelManager().getModel(location);
24+
}
2625

27-
public static float getPartialTicks() {
28-
return mc.isPaused() ? ((MinecraftAccessor) mc).getPausePartialTick() : mc.getFrameTime();
29-
}
26+
public static float getPartialTicks() {
27+
return mc.getTimer().getGameTimeDeltaPartialTick(mc.isPaused());
28+
}
3029

31-
public static void registerItemRenderer(ItemLike item, BEWLItemRenderer renderer) {
32-
BuiltinItemRendererRegistry.INSTANCE.register(item, (stack, mode, matrices, vertexConsumers, light, overlay) -> renderer.render(stack, mode, matrices, vertexConsumers, OERenderUtils.getPartialTicks(), light, overlay));
33-
}
30+
public static void registerItemRenderer(
31+
ItemLike item,
32+
BEWLItemRenderer renderer
33+
) {
34+
BuiltinItemRendererRegistry.INSTANCE.register(
35+
item,
36+
(stack, mode, matrices, vertexConsumers, light, overlay) ->
37+
renderer.render(
38+
stack,
39+
mode,
40+
matrices,
41+
vertexConsumers,
42+
OERenderUtils.getPartialTicks(),
43+
light,
44+
overlay
45+
)
46+
);
47+
}
3448
}

‎fabric/src/main/java/org/modsauce/otyacraftenginerenewed/fabric/client/handler/ModelResourceHandler.java‎

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
package org.modsauce.otyacraftenginerenewed.fabric.client.handler;
22

3-
import org.modsauce.otyacraftenginerenewed.client.callpoint.ClientCallPointManager;
4-
import net.fabricmc.fabric.api.client.model.ExtraModelProvider;
5-
import net.fabricmc.fabric.api.client.model.ModelLoadingRegistry;
3+
import java.util.ArrayList;
4+
import java.util.List;
5+
import net.fabricmc.fabric.api.client.model.loading.v1.ModelLoadingPlugin;
66
import net.minecraft.resources.ResourceLocation;
7-
import net.minecraft.server.packs.resources.ResourceManager;
7+
import org.modsauce.otyacraftenginerenewed.client.callpoint.ClientCallPointManager;
88

9-
import java.util.function.Consumer;
9+
public class ModelResourceHandler implements ModelLoadingPlugin {
1010

11-
public class ModelResourceHandler implements ExtraModelProvider {
12-
public static void init() {
13-
ModelLoadingRegistry.INSTANCE.registerModelProvider(new ModelResourceHandler());
14-
}
11+
public static void init() {
12+
ModelLoadingPlugin.register(new ModelResourceHandler());
13+
}
1514

16-
@Override
17-
public void provideExtraModels(ResourceManager manager, Consumer<ResourceLocation> out) {
18-
ClientCallPointManager.getInstance().call().onModelRegistry(out::accept);
19-
}
15+
@Override
16+
public void onInitializeModelLoader(Context pluginContext) {
17+
List<ResourceLocation> models = new ArrayList<>();
18+
ClientCallPointManager.getInstance().call().onModelRegistry(models::add);
19+
pluginContext.addModels(models);
20+
}
2021
}

0 commit comments

Comments
 (0)