Skip to content

Commit 06d8a73

Browse files
WilyicaroWilyicaro
committed
ported 26.1.1 to NeoForge and Forge
1 parent 88f1d36 commit 06d8a73

19 files changed

Lines changed: 130 additions & 109 deletions

‎build-logic/src/main/kotlin/ModPlatformPlugin.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -321,9 +321,6 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
321321
string(eval(current.version, ">=26.1"), "!renaming_26") {
322322
replace("net/minecraft/client/gui/GuiGraphics", "net/minecraft/client/gui/GuiGraphicsExtractor")
323323
}
324-
string(eval(current.version, ">=26.1"), "!renaming_26") {
325-
replace("renderSelectedItemName", "extractSelectedItemName")
326-
}
327324
string(eval(current.version, ">=26.1"), "!renaming_26") {
328325
replace("renderHotbarAndDecorations", "extractHotbarAndDecorations")
329326
}
@@ -333,6 +330,12 @@ abstract class ModPlatformPlugin @Inject constructor() : Plugin<Project> {
333330
string(eval(current.version, ">=26.1"), "!renaming_26") {
334331
replace("net/minecraft/client/gui/contextualbar/ContextualBarRenderer;renderBackground(Lnet/minecraft/client/gui/GuiGraphics;Lnet/minecraft/client/DeltaTracker;)V", "net/minecraft/client/gui/contextualbar/ContextualBarRenderer;extractBackground(Lnet/minecraft/client/gui/GuiGraphicsExtractor;Lnet/minecraft/client/DeltaTracker;)V")
335332
}
333+
string(eval(current.version, ">=26.1"), "!renaming_26") {
334+
replace("renderContextualInfoBarBackground", "extractContextualInfoBarBackground")
335+
}
336+
string(eval(current.version, ">=26.1"), "!renaming_26") {
337+
replace("renderContextualInfoBar", "extractContextualInfoBar")
338+
}
336339
}
337340
}
338341
}

‎gradle/libs.versions.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ stonecutter-postprocess = "2.1-beta.8"
44
mod-publish = "1.1.0"
55
dotenv-gradle = "4.0.0"
66
fabric-loom = "1.15-SNAPSHOT"
7-
neoforge-moddev = "2.0.120"
7+
neoforge-moddev = "2.0.141"
88
forge-gradle = "[7.0.17,8)"
99
foojay = "1.0.0"
1010
fabric-loader = "0.18.6"

‎settings.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ stonecutter {
3939
match("1.21.8", "fabric", "forge", "neoforge")
4040
match("1.21.10", "fabric", "forge", "neoforge")
4141
match("1.21.11", "fabric", "forge", "neoforge")
42-
match("26.1.1", "fabric"/*, "forge", "neoforge"*/)
42+
match("26.1.1", "fabric", "forge", "neoforge")
4343
vcsVersion = "1.20.4-fabric"
4444
}
4545
}

‎src/main/java/wily/factoryapi/FactoryAPI.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
import net.neoforged.fml.loading.FMLEnvironment;
3636
import net.neoforged.neoforge.capabilities.RegisterCapabilitiesEvent;
3737
//? if >=1.21.9 {
38-
/^import net.neoforged.fml.loading.FMLLoader;
39-
^///?}
38+
import net.neoforged.fml.loading.FMLLoader;
39+
//?}
4040
*///?}
4141
import org.apache.logging.log4j.LogManager;
4242
import org.apache.logging.log4j.Logger;
@@ -215,7 +215,7 @@ public static boolean isLoadingMod(String modId) {
215215
//? if fabric {
216216
return isModLoaded(modId);
217217
//?} else if forge || (neoforge && <1.21.9) {
218-
/*return LoadingModList.get().getModFileById(modId) != null;
218+
/*return LoadingModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getModFileById(modId) != null;
219219
*///?} else if neoforge {
220220
/*return FMLLoader.getCurrent().getLoadingModList().getModFileById(modId) != null;
221221
*///?} else
@@ -226,7 +226,7 @@ public static boolean isModLoaded(String modId) {
226226
//? if fabric {
227227
return FabricLoader.getInstance().isModLoaded(modId);
228228
//?} else if forge || neoforge {
229-
/*return ModList.get().isLoaded(modId);
229+
/*return ModList/^? if <26.1 || neoforge {^/.get()/^?}^/.isLoaded(modId);
230230
*///?} else
231231
/*throw new AssertionError();*/
232232
}

‎src/main/java/wily/factoryapi/FactoryAPIClient.java‎

Lines changed: 26 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,12 @@
130130
import net.neoforged.fml.event.lifecycle.FMLClientSetupEvent;
131131
import net.neoforged.fml.ModList;
132132
//? if <1.20.5 {
133-
import net.neoforged.neoforge.event.TickEvent;
133+
/^import net.neoforged.neoforge.event.TickEvent;
134134
import net.neoforged.neoforge.client.ConfigScreenHandler;
135-
//?} else {
136-
/^import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
135+
^///?} else {
136+
import net.neoforged.neoforge.client.extensions.common.RegisterClientExtensionsEvent;
137137
import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
138-
^///?}
138+
//?}
139139
import net.neoforged.neoforge.client.event.*;
140140
import net.neoforged.neoforge.client.extensions.common.IClientFluidTypeExtensions;
141141
import net.neoforged.neoforge.client.extensions.common.IClientItemExtensions;
@@ -299,14 +299,14 @@ public static void init() {
299299
/*FactoryAPIPlatform.getModEventBus().addListener(RegisterClientExtensionsEvent.class,r->IFactoryItemClientExtension.map.forEach((i,c)->r.registerItem(new IClientItemExtensions() {
300300
@Override
301301
//? if <1.21.2 {
302-
public HumanoidModel<?> getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel<?> original) {
302+
/^public HumanoidModel<?> getHumanoidArmorModel(LivingEntity livingEntity, ItemStack itemStack, EquipmentSlot equipmentSlot, HumanoidModel<?> original) {
303303
return c.getHumanoidArmorModel(livingEntity, itemStack, equipmentSlot, original);
304304
}
305-
//?} else {
306-
/^public Model getHumanoidArmorModel(ItemStack itemStack, /^¹? if <1.21.4 {¹^/ EquipmentModel.LayerType/^¹?} else {¹^//^¹EquipmentClientInfo.LayerType¹^//^¹?}¹^/ layerType, Model original) {
305+
^///?} else {
306+
public Model getHumanoidArmorModel(ItemStack itemStack, /^? if <1.21.4 {^/ /^EquipmentModel.LayerType^//^?} else {^/EquipmentClientInfo.LayerType/^?}^/ layerType, Model original) {
307307
return c.getHumanoidArmorModel(itemStack, layerType, original);
308308
}
309-
^///?}
309+
//?}
310310
}, i)));
311311
*///?}
312312
//? if >=1.21.4 {
@@ -366,8 +366,8 @@ public static void preTick(Consumer<Minecraft> listener) {
366366
*///?} elif forge {
367367
/*TickEvent.ClientTickEvent.Pre.BUS.addListener(p-> listener.accept(Minecraft.getInstance()));
368368
*///?} elif neoforge {
369-
/*NeoForge.EVENT_BUS.addListener(/^? if <1.20.5 {^/ TickEvent.ClientTickEvent.class/^?} else {^//^ClientTickEvent.Pre.class^//^?}^/, e-> {
370-
/^? if <1.20.5 {^/if (e.phase == TickEvent.Phase.START)/^?}^/ listener.accept(Minecraft.getInstance());
369+
/*NeoForge.EVENT_BUS.addListener(/^? if <1.20.5 {^/ /^TickEvent.ClientTickEvent.class^//^?} else {^/ClientTickEvent.Pre.class/^?}^/, e-> {
370+
/^? if <1.20.5 {^//^if (e.phase == TickEvent.Phase.START)^//^?}^/ listener.accept(Minecraft.getInstance());
371371
});
372372
*///?} else
373373
/*throw new AssertionError();*/
@@ -383,8 +383,8 @@ public static void postTick(Consumer<Minecraft> listener) {
383383
*///?} elif forge {
384384
/*TickEvent.ClientTickEvent.Post.BUS.addListener(p-> listener.accept(Minecraft.getInstance()));
385385
*///?} elif neoforge {
386-
/*NeoForge.EVENT_BUS.addListener(/^? if <1.20.5 {^/ TickEvent.ClientTickEvent.class/^?} else {^//^ClientTickEvent.Post.class^//^?}^/, e-> {
387-
/^? if <1.20.5 {^/if (e.phase == TickEvent.Phase.END)/^?}^/ listener.accept(Minecraft.getInstance());
386+
/*NeoForge.EVENT_BUS.addListener(/^? if <1.20.5 {^/ /^TickEvent.ClientTickEvent.class^//^?} else {^/ClientTickEvent.Post.class/^?}^/, e-> {
387+
/^? if <1.20.5 {^//^if (e.phase == TickEvent.Phase.END)^//^?}^/ listener.accept(Minecraft.getInstance());
388388
});
389389
*///?} else
390390
/*throw new AssertionError();*/
@@ -417,16 +417,20 @@ public static TextureAtlasSprite getFluidFlowingTexture(Fluid fluid) {
417417
}
418418

419419
public static int getFluidColor(Fluid fluid, BlockAndTintGetter view, BlockPos pos) {
420-
//? if fabric {
420+
//? if >=26.1 {
421+
/*return Minecraft.getInstance().getModelManager().getFluidStateModelSet().get(fluid.defaultFluidState()).tintSource().colorInWorld(fluid.defaultFluidState().createLegacyBlock(), view, pos);
422+
*///?} else if fabric {
421423
return FluidVariantRendering.getColor(FluidVariant.of(fluid),view,pos);
422-
//?} elif forge || neoforge {
424+
//?} elif (forge || neoforge) && <26.1 {
423425
/*return IClientFluidTypeExtensions.of(fluid).getTintColor(fluid.defaultFluidState(),view,pos);
424426
*///?} else
425427
/*throw new AssertionError();*/
426428
}
427429

428430
public static int getFluidColor(FluidInstance fluid) {
429-
//? if fabric {
431+
//? if >=26.1 {
432+
/*return Minecraft.getInstance().getModelManager().getFluidStateModelSet().get(fluid.getFluid().defaultFluidState()).tintSource().color(fluid.getFluid().defaultFluidState().createLegacyBlock());
433+
*///?} else if fabric {
430434
return FluidVariantRendering.getColor(fluid.toVariant(), null, null);
431435
//?} elif forge || neoforge {
432436
/*return IClientFluidTypeExtensions.of(fluid.getFluid()).getTintColor(fluid.toStack());
@@ -458,7 +462,7 @@ public static Screen getConfigScreen(ModInfo mod, Screen screen) {
458462
//? if fabric {
459463
return FactoryAPI.isModLoaded("modmenu") ? FactoryAPIModMenuCompat.getConfigScreen(mod.getId(),screen) : null;
460464
//?} else if forge || (neoforge && <1.20.5) {
461-
/*return ModList.get().getModContainerById(mod.getId()).flatMap(c-> ConfigScreenHandler.getScreenFactoryFor(c.getModInfo())).map(s-> s.apply(Minecraft.getInstance(), screen)).orElse(null);
465+
/*return ModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getModContainerById(mod.getId()).flatMap(c-> ConfigScreenHandler.getScreenFactoryFor(c.getModInfo())).map(s-> s.apply(Minecraft.getInstance(), screen)).orElse(null);
462466
*///?} else if neoforge {
463467
/*return ModList.get().getModContainerById(mod.getId()).flatMap(m-> IConfigScreenFactory.getForMod(m.getModInfo()).map(s -> s.createScreen(m, screen))).orElse(null);
464468
*///?} else
@@ -474,7 +478,7 @@ public static void registerConfigScreen(ModInfo mod, Function<Screen,Screen> con
474478
//? if fabric {
475479
if (FactoryAPI.isModLoaded("modmenu")) setup(m-> FactoryAPIModMenuCompat.registerConfigScreen(mod.getId(), configScreenFactory));
476480
//?} else if forge || (neoforge && <1.20.5) {
477-
/*ModList.get().getModContainerById(mod.getId()).ifPresent(c->c.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, ()-> new ConfigScreenHandler.ConfigScreenFactory((m,s)->configScreenFactory.apply(s))));
481+
/*ModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getModContainerById(mod.getId()).ifPresent(c->c.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, ()-> new ConfigScreenHandler.ConfigScreenFactory((m,s)->configScreenFactory.apply(s))));
478482
*///?} else if neoforge {
479483
/*ModList.get().getModContainerById(mod.getId()).ifPresent(c->c.registerExtensionPoint(IConfigScreenFactory.class, (m,s)-> configScreenFactory.apply(s)));
480484
*///?}
@@ -501,7 +505,7 @@ public static void registerBlockColor(Consumer<BiConsumer</*? if >=26.1 {*//*Lis
501505
*///?} else if fabric {
502506
registry.accept(ColorProviderRegistry.BLOCK::register);
503507
//?} elif (forge && <1.21.6) || neoforge {
504-
/*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL, false, RegisterColorHandlersEvent.Block.class, e->registry.accept(e::register));
508+
/*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL, false, RegisterColorHandlersEvent./^? if >=26.1 {^/BlockTintSources/^?} else {^//^Block^//^?}^/.class, e->registry.accept(e::register));
505509
*///?} elif forge && <1.21.9 {
506510
/*RegisterColorHandlersEvent.Block.getBus(FactoryAPIPlatform.getModEventBus()).addListener(e-> registry.accept(e::register));
507511
*///?} elif forge {
@@ -577,7 +581,7 @@ public static void registerLayerDefinition(ModelLayerLocation location, Supplier
577581
EntityModelLayerRegistry.registerModelLayer(location, definition::get);
578582
//?} else if (forge && <1.21.6) || neoforge {
579583
/*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL, false, EntityRenderersEvent.RegisterLayerDefinitions.class, e-> e.registerLayerDefinition(location,definition));
580-
*///?} else if forge {
584+
*///?} else if forge && <1.21.10 {
581585
/*EntityRenderersEvent.RegisterLayerDefinitions.getBus(FactoryAPIPlatform.getModEventBus()).addListener(e-> e.registerLayerDefinition(location,definition));
582586
*///?} else if forge {
583587
/*EntityRenderersEvent.RegisterLayerDefinitions.BUS.addListener(e-> e.registerLayerDefinition(location,definition));
@@ -612,8 +616,8 @@ public EntityModelSet getEntityModelSet() {
612616
//?} else if (forge && <1.21.6) || neoforge {
613617
/*FactoryAPIPlatform.getModEventBus().addListener(EventPriority.NORMAL, false, EntityRenderersEvent.AddLayers.class, e-> registry.accept(new FactoryRenderLayerRegistry() {
614618
@Override
615-
public EntityRenderer<?/^? if >=1.21.2 {^//^, ? ^//^?}^/> getEntityRenderer(EntityType<? extends LivingEntity> entityType) {
616-
return e./^? if >=1.20.2 && forge {^//^getEntityRenderer^//^?} else {^/getRenderer/^?}^/(entityType);
619+
public EntityRenderer<?/^? if >=1.21.2 {^/, ? /^?}^/> getEntityRenderer(EntityType<? extends LivingEntity> entityType) {
620+
return e./^? if >=1.20.2 && forge {^/getEntityRenderer/^?} else {^//^getRenderer^//^?}^/(entityType);
617621
}
618622
619623
@Override
@@ -622,7 +626,7 @@ public EntityModelSet getEntityModelSet() {
622626
}
623627
624628
@Override
625-
public <T extends /^? if >=1.21.2 {^/ /^LivingEntityRenderState, S extends ^//^?}^/LivingEntity,M extends EntityModel<T>> void register(LivingEntityRenderer</^? if >=1.21.2 {^/ /^S, ^//^?}^/T, M> renderer, RenderLayer<T, M> renderLayer) {
629+
public <T extends /^? if >=1.21.2 {^/ LivingEntityRenderState, S extends /^?}^/LivingEntity,M extends EntityModel<T>> void register(LivingEntityRenderer</^? if >=1.21.2 {^/ S, /^?}^/T, M> renderer, RenderLayer<T, M> renderLayer) {
626630
renderer.addLayer(renderLayer);
627631
}
628632
}));

‎src/main/java/wily/factoryapi/FactoryAPIPlatform.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,18 +88,18 @@
8888
import net.neoforged.neoforge.capabilities.ItemCapability;
8989
import net.neoforged.neoforge.fluids.FluidStack;
9090
//? if <1.21.9 {
91-
import net.neoforged.neoforge.energy.IEnergyStorage;
91+
/^import net.neoforged.neoforge.energy.IEnergyStorage;
9292
import net.neoforged.neoforge.fluids.capability.IFluidHandler;
9393
import net.neoforged.neoforge.fluids.capability.IFluidHandlerItem;
9494
import net.neoforged.neoforge.items.IItemHandler;
95-
//?} else {
96-
/^import net.neoforged.neoforge.transfer.energy.EnergyHandler;
95+
^///?} else {
96+
import net.neoforged.neoforge.transfer.energy.EnergyHandler;
9797
import net.neoforged.neoforge.transfer.ResourceHandler;
9898
import net.neoforged.neoforge.transfer.fluid.FluidResource;
9999
import net.neoforged.neoforge.transfer.item.ItemResource;
100100
import net.neoforged.neoforge.transfer.access.ItemAccess;
101101
import net.neoforged.fml.loading.FMLLoader;
102-
^///?}
102+
//?}
103103
import net.neoforged.fml.ModContainer;
104104
import net.neoforged.fml.loading.FMLEnvironment;
105105
import net.neoforged.fml.loading.moddiscovery.ModFileInfo;
@@ -547,7 +547,7 @@ static Collection<ModInfo> getMods() {
547547
//? if fabric {
548548
FabricLoader.getInstance().getAllMods().forEach(m-> getModInfo(m.getMetadata().getId()));
549549
//?} else if forge || (neoforge && <1.21.9) {
550-
/*LoadingModList.get().getMods().forEach(m-> getModInfo(m.getModId()));
550+
/*LoadingModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getMods().forEach(m-> getModInfo(m.getModId()));
551551
*///?} else if neoforge {
552552
/*FMLLoader.getCurrent().getLoadingModList().getMods().forEach(m-> getModInfo(m.getModId()));
553553
*///?}
@@ -627,8 +627,8 @@ public boolean isHidden() {
627627
};
628628
//?} else if forge || neoforge {
629629
/*return new ModInfo() {
630-
IModFileInfo info = ModList.get().getModFileById(modId);
631-
Optional<? extends ModContainer> opt = ModList.get().getModContainerById(modId);
630+
IModFileInfo info = ModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getModFileById(modId);
631+
Optional<? extends ModContainer> opt = ModList/^? if <26.1 || neoforge {^/.get()/^?}^/.getModContainerById(modId);
632632
@Override
633633
public Collection<String> getAuthors() {
634634
return opt.flatMap(c->c.getModInfo().getConfig().getConfigElement("authors").map(s-> Collections.singleton(String.valueOf(s)))).orElse(Collections.emptySet());

0 commit comments

Comments
 (0)