Skip to content

Commit 2879872

Browse files
committed
Can compile forge jars taht can be used out of dev. Not prod ready.
1 parent 2187c8d commit 2879872

File tree

8 files changed

+55
-7
lines changed

8 files changed

+55
-7
lines changed

common/src/main/java/generations/gg/generations/core/generationscore/common/client/GenerationsTextureLoader.kt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,6 @@ object GenerationsTextureLoader : ITextureLoader() {
6363
}
6464
}
6565

66-
System.out.println()
67-
6866
// RARE_CANDY.listMatchingResources(manager).values.forEach { resouce ->
6967
// resouce.openAsReader().use { GsonHelper.fromJson(gson, it, RARE_CANDY_TYPE) }.forEach { (key, value) ->
7068
// register(key, SimpleTextureEnhanced(value.asResource().let { "${it.namespace}:textures/${it.path}.png" }.asResource()))

common/src/main/resources/GenerationsCore-common.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "generations.gg.generations.core.generationscore.common.mixin",
5-
"compatibilityLevel": "JAVA_17",
5+
"compatibilityLevel": "JAVA_21",
66
"mixins": [
77
"AbilityChangerMixin",
88
"AbstractCauldronBlockMixin",

fabric/src/main/resources/GenerationsCore.mixins.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"required": true,
33
"minVersion": "0.8",
44
"package": "generations.gg.generations.core.generationscore.fabric.mixin",
5-
"compatibilityLevel": "JAVA_17",
5+
"compatibilityLevel": "JAVA_21",
66
"mixins": [
77
"AbstractHorseMixin",
88
"AnvilMenuMixin",

gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ org.gradle.daemon=false
33
minecraft_version=1.21.1
44

55
archives_base_name=Generations-Core
6-
mod_version=1.1.0
6+
mod_version=1.2.0
77
maven_group=generations.gg.generations.core
88

99
architectury_version=13.0.8

neoforge/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ configurations {
6060
modApi("dev.architectury:architectury-neoforge:${project.properties["architectury_version"]}")
6161

6262
"common"(project(":common", "namedElements")) { isTransitive = false }
63-
"shadowBundle"(project(":common", "transformProductionForge"))
63+
"shadowBundle"(project(":common", "transformProductionNeoForge"))
6464

6565
modImplementation(group = "earth.terrarium.common_storage_lib", name = "common-storage-lib-neoforge-1.21.1", version = "0.0.7")
6666

neoforge/src/main/java/generations/gg/generations/core/generationscore/forge/GenerationsCoreForge.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ class GenerationsCoreForge(MOD_BUS: IEventBus) : GenerationsImplementation {
195195
*/
196196
private fun onInitialize(event: FMLCommonSetupEvent) {
197197
event.enqueueWork { VanillaCompat.setup() }
198-
MutableBlockEntityType.blocksToAdd.forEach { block -> block.instanceOrNull<MutableBlockEntityType<*>>()?.addBlock(block) }
198+
MutableBlockEntityType.blocksToAdd.forEach { block -> block.blockEntityType.instanceOrNull<MutableBlockEntityType<*>>()?.addBlock(block) }
199199
}
200200

201201
private fun postInit(event: FMLLoadCompleteEvent) {
Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
public net.minecraft.world.level.block.state.properties.WoodType register(Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/world/level/block/state/properties/WoodType; # register
2+
public net.minecraft.world.level.block.Blocks never(Lnet/minecraft/world/level/block/state/BlockState;Lnet/minecraft/world/level/BlockGetter;Lnet/minecraft/core/BlockPos;Lnet/minecraft/world/entity/EntityType;)Ljava/lang/Boolean; # never
3+
public net.minecraft.data.worldgen.features.TreeFeatures createStraightBlobTree(Lnet/minecraft/world/level/block/Block;Lnet/minecraft/world/level/block/Block;IIII)Lnet/minecraft/world/level/levelgen/feature/configurations/TreeConfiguration$TreeConfigurationBuilder; # createStraightBlobTree
4+
public net.minecraft.world.level.block.AbstractCauldronBlock canReceiveStalactiteDrip(Lnet/minecraft/world/level/material/Fluid;)Z # canReceiveStalactiteDrip
5+
public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen clickedSlot # clickedSlot
6+
public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen draggingItem # draggingItem
7+
public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen isSplittingStack # isSplittingStack
8+
public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen quickCraftingType # quickCraftingType
9+
public net.minecraft.client.gui.screens.inventory.AbstractContainerScreen recalculateQuickCraftRemaining()V # recalculateQuickCraftRemaining
10+
public-f net.minecraft.world.level.block.Block stateDefinition # stateDefinition
11+
public net.minecraft.world.item.context.UseOnContext <init>(Lnet/minecraft/world/entity/player/Player;Lnet/minecraft/world/InteractionHand;Lnet/minecraft/world/phys/BlockHitResult;)V # <init>
12+
public net.minecraft.client.renderer.entity.FishingHookRenderer stringVertex(FFFLcom/mojang/blaze3d/vertex/VertexConsumer;Lcom/mojang/blaze3d/vertex/PoseStack$Pose;FF)V # stringVertex
13+
public net.minecraft.world.level.block.state.properties.BlockSetType register(Lnet/minecraft/world/level/block/state/properties/BlockSetType;)Lnet/minecraft/world/level/block/state/properties/BlockSetType; # register
14+
public-f net.minecraft.world.item.AxeItem STRIPPABLES # STRIPPABLES
15+
public net.minecraft.world.level.block.FireBlock setFlammable(Lnet/minecraft/world/level/block/Block;II)V # setFlammable
16+
17+
public net.minecraft.client.renderer.Sheets createSignMaterial(Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/resources/model/Material; # createSignMaterial
18+
public net.minecraft.client.renderer.Sheets createHangingSignMaterial(Lnet/minecraft/world/level/block/state/properties/WoodType;)Lnet/minecraft/client/resources/model/Material; # createHangingSignMaterial
19+
20+
public-f net.minecraft.world.inventory.Slot x # x
21+
public-f net.minecraft.world.inventory.Slot y # y
22+
23+
public-f net.minecraft.world.entity.projectile.FishingHook luck # luck
24+
public-f net.minecraft.world.entity.projectile.FishingHook lureSpeed # lureSpeed
25+
public net.minecraft.world.entity.projectile.FishingHook nibble # nibble
26+
public net.minecraft.world.entity.projectile.FishingHook shouldStopFishing(Lnet/minecraft/world/entity/player/Player;)Z # shouldStopFishing
27+
public net.minecraft.client.renderer.entity.FishingHookRenderer vertex(Lcom/mojang/blaze3d/vertex/VertexConsumer;Lorg/joml/Matrix4f;Lorg/joml/Matrix3f;IFIII)V # vertex
28+
public net.minecraft.world.entity.Entity getEyeHeight(Lnet/minecraft/world/entity/Pose;)F # getEyeHeight
29+
public net.minecraft.client.renderer.LevelRenderer ticks # ticks
30+
31+
public net.minecraft.client.renderer.entity.EntityRenderer shadowRadius # shadowRadius
32+
public net.minecraft.client.renderer.entity.EntityRenderer shadowStrength # shadowStrength
33+
34+
public-f net.minecraft.world.level.block.entity.BlockEntityType validBlocks # validBlocks
35+
36+
public com.mojang.blaze3d.platform.GlStateManager BLEND # BLEND
37+
public com.mojang.blaze3d.platform.GlStateManager$BlendState
38+
public com.mojang.blaze3d.platform.GlStateManager$BooleanState enabled # enabled
39+
40+
public-f net.minecraft.client.model.geom.ModelPart
41+
public net.minecraft.server.network.ServerCommonPacketListenerImpl connection # connection
42+
43+
public-f net.minecraft.world.entity.LivingEntity getDimensions(Lnet/minecraft/world/entity/Pose;)Lnet/minecraft/world/entity/EntityDimensions; # getDimensions
44+
public-f net.minecraft.world.entity.LivingEntity canBreatheUnderwater()Z # canBreatheUnderwater

neoforge/src/main/resources/META-INF/neoforge.mods.toml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,12 @@ Core mod for Generations. Required for all other Generations mods.
1616
Contains Blocks, Items, Entities, and other things that are used by all other Generations mods.
1717
'''
1818

19+
[[accessTransformers]]
20+
file="META-INF/accesstransformer.cfg"
21+
22+
[[mixins]]
23+
config="GenerationsCore-common.mixins.json"
24+
1925
[[dependencies.generations_core]]
2026
modId="neoforge"
2127
mandatory=true

0 commit comments

Comments
 (0)