Skip to content

Commit 5512e66

Browse files
committed
Update to 1.16.2
Refactor ore generation for 1.16.2
1 parent 575a20c commit 5512e66

File tree

9 files changed

+62
-73
lines changed

9 files changed

+62
-73
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ dependencies {
2727
// Fabric API. This is technically optional, but you probably want it anyway.
2828
modCompile "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
2929

30-
modCompile("vazkii.patchouli:Patchouli_1.16-fabric:${project.patchouli_version}")
30+
modCompile("vazkii.patchouli:Patchouli:${project.patchouli_version}")
3131
// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
3232
// You may need to force-disable transitiveness on them.
3333
}

gradle.properties

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,16 @@ org.gradle.jvmargs=-Xmx1G
33

44
# Fabric Properties
55
# check these on https://fabricmc.net/use
6-
minecraft_version=1.16.1
7-
yarn_mappings=1.16.1+build.7
8-
loader_version=0.8.8+build.202
6+
minecraft_version=1.16.2
7+
yarn_mappings=1.16.2+build.6
8+
loader_version=0.9.1+build.205
99

1010
# Mod Properties
11-
mod_version = 2.0.0
11+
mod_version = 2.0.1
1212
maven_group = eu.midnightdust.motschen
1313
archives_base_name = decorative
1414

1515
# Dependencies
1616
# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
17-
fabric_version=0.14.0+build.371-1.16
18-
patchouli_version=1.16-37.21-FABRIC
17+
fabric_version=0.17.2+build.396-1.16
18+
patchouli_version=1.16-40-FABRIC

src/main/java/eu/midnightdust/motschen/decorative/DecorativeMain.java

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -90,30 +90,9 @@ public void onInitialize() {
9090
Registry.register(Registry.ITEM, new Identifier("decorative","christmas_tree"), new BlockItem(ChristmasTree, new Item.Settings().group(DecorativeMain.IndoorGroup)));
9191
Registry.register(Registry.BLOCK, new Identifier("decorative","christmas_lights"), ChristmasLights);
9292
Registry.register(Registry.ITEM, new Identifier("decorative","christmas_lights"), new BlockItem(ChristmasLights, new Item.Settings().group(DecorativeMain.IndoorGroup)));
93+
9394
Lamps.init();
9495
DoubleLamps.init();
95-
eu.midnightdust.motschen.decorative.world.RockyAsphalt.initBiomeFeatures();
96-
}
97-
public enum Ores implements ItemConvertible {
98-
RockyAsphalt(7, 20, 14, 200);
99-
100-
public final String name;
101-
public final int veinSize;
102-
public final int veinsPerChunk;
103-
public final int minY;
104-
public final int maxY;
105-
106-
Ores(int veinSize, int veinsPerChunk, int minY, int maxY) {
107-
name = this.toString().toLowerCase(Locale.ROOT);
108-
this.veinSize = veinSize;
109-
this.veinsPerChunk = veinsPerChunk;
110-
this.minY = minY;
111-
this.maxY = maxY;
112-
}
113-
114-
@Override
115-
public Item asItem() {
116-
return RockyAsphalt.asItem();
117-
}
96+
OreFeatures.init();
11897
}
11998
}
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package eu.midnightdust.motschen.decorative;
2+
3+
import net.minecraft.util.Identifier;
4+
import net.minecraft.util.registry.BuiltinRegistries;
5+
import net.minecraft.util.registry.Registry;
6+
import net.minecraft.world.gen.feature.ConfiguredFeature;
7+
import net.minecraft.world.gen.feature.Feature;
8+
import net.minecraft.world.gen.feature.OreFeatureConfig;
9+
10+
public class OreFeatures {
11+
public static final ConfiguredFeature<?, ?> ROCKY_ASPHALT_FEATURE = Feature.ORE.configure(new OreFeatureConfig(OreFeatureConfig.Rules.BASE_STONE_OVERWORLD, DecorativeMain.RockyAsphalt.getDefaultState(), 7)).method_30377(200).spreadHorizontally().repeat(20);
12+
13+
public static void init() {
14+
Registry.register(BuiltinRegistries.CONFIGURED_FEATURE, new Identifier(DecorativeMain.MOD_ID, "rocky_asphalt"), ROCKY_ASPHALT_FEATURE);
15+
16+
}
17+
}

src/main/java/eu/midnightdust/motschen/decorative/item/BathTireItem.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import net.minecraft.item.Item;
1010
import net.minecraft.item.ItemStack;
1111
import net.minecraft.nbt.CompoundTag;
12+
import net.minecraft.server.world.ServerWorld;
1213
import net.minecraft.stat.Stats;
1314
import net.minecraft.util.Hand;
1415
import net.minecraft.util.TypedActionResult;
@@ -42,7 +43,7 @@ public TypedActionResult<ItemStack> use(World world, PlayerEntity user, Hand han
4243
return TypedActionResult.pass(itemStack);
4344
} else if (world.canPlayerModifyAt(user, blockPos) && user.canPlaceOn(blockPos, blockHitResult.getSide(), itemStack)) {
4445
EntityType<?> entityType = this.getEntityType(itemStack.getTag());
45-
if (entityType.spawnFromItemStack(world, itemStack, user, blockPos.up(1), SpawnReason.SPAWN_EGG, false, false) == null) {
46+
if (entityType.spawnFromItemStack((ServerWorld) world, itemStack, user, blockPos.up(1), SpawnReason.SPAWN_EGG, false, false) == null) {
4647
return TypedActionResult.pass(itemStack);
4748
} else {
4849
if (!user.abilities.creativeMode) {
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package eu.midnightdust.motschen.decorative.mixin;
2+
3+
import eu.midnightdust.motschen.decorative.OreFeatures;
4+
import net.minecraft.world.biome.GenerationSettings.Builder;
5+
import net.minecraft.world.gen.GenerationStep;
6+
import net.minecraft.world.gen.feature.DefaultBiomeFeatures;
7+
import org.spongepowered.asm.mixin.Mixin;
8+
import org.spongepowered.asm.mixin.injection.At;
9+
import org.spongepowered.asm.mixin.injection.Inject;
10+
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
11+
12+
@Mixin(DefaultBiomeFeatures.class)
13+
public class DefaultBiomeFeaturesMixin {
14+
@Inject(at = @At("RETURN"), method = "addDefaultOres")
15+
private static void addDefaultOres(Builder builder, CallbackInfo info) {
16+
builder.feature(GenerationStep.Feature.UNDERGROUND_ORES, OreFeatures.ROCKY_ASPHALT_FEATURE);
17+
}
18+
}

src/main/java/eu/midnightdust/motschen/decorative/world/RockyAsphalt.java

Lines changed: 0 additions & 41 deletions
This file was deleted.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
{
2+
"required": true,
3+
"package": "eu.midnightdust.motschen.decorative.mixin",
4+
"compatibilityLevel": "JAVA_8",
5+
"mixins": [
6+
"DefaultBiomeFeaturesMixin"
7+
],
8+
"injectors": {
9+
"defaultRequire": 1
10+
}
11+
}

src/main/resources/fabric.mod.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"schemaVersion": 1,
33
"id": "decorative",
4-
"version": "2.0.0 - Summer 2020 Update",
4+
"version": "${version}",
55

66
"name": "Decorative",
77
"description": "Adds many cool new decorative items with 3d models!",
@@ -27,6 +27,10 @@
2727
]
2828
},
2929

30+
"mixins": [
31+
"decorative.mixins.json"
32+
],
33+
3034
"depends": {
3135
"fabricloader": ">=0.7.2",
3236
"fabric": "*"

0 commit comments

Comments
 (0)