Skip to content

Commit 62048f0

Browse files
LemmaEOFLemmaEOF
committed
1.16 update
1 parent 43de863 commit 62048f0

File tree

18 files changed

+52
-46
lines changed

18 files changed

+52
-46
lines changed

‎build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
33
id "maven-publish"
4-
id "fabric-loom" version "0.2.7-SNAPSHOT"
4+
id "fabric-loom" version "0.4-SNAPSHOT"
55
}
66

7-
def minecraftVersion = "1.15.2"
8-
def yarnMappings = "1.15.2+build.3:v2"
9-
def loaderVersion = "0.7.8+build.184"
7+
def minecraftVersion = "1.16.1"
8+
def yarnMappings = "1.16.1+build.9:v2"
9+
def loaderVersion = "0.8.8+build.202"
1010

1111
archivesBaseName = "cotton"
12-
version = "1.0.3"
12+
version = "1.0.4"
1313
group = "io.github.cottonmc.cotton"
1414

1515
sourceCompatibility = 1.8
@@ -35,7 +35,7 @@ dependencies {
3535
minecraft "com.mojang:minecraft:$minecraftVersion"
3636
mappings "net.fabricmc:yarn:$yarnMappings"
3737
modImplementation "net.fabricmc:fabric-loader:$loaderVersion"
38-
modImplementation "net.fabricmc.fabric-api:fabric-api:0.11.1+build.312-1.15"
38+
modImplementation "net.fabricmc.fabric-api:fabric-api:0.14.0+build.371-1.16"
3939

4040
// `modApi`s below are for the dev env
4141
def modules = ["player-events", "logging", "config", "datapack", "commons", "cauldron"]
@@ -44,7 +44,7 @@ dependencies {
4444
include "io.github.cottonmc.cotton:cotton-$module:+"
4545
}
4646
modApi ("io.github.cottonmc:Jankson-Fabric:2.0.1+j1.2.0") { transitive = false }
47-
modApi ("io.github.cottonmc:LibCD:2.3.0+1.15.2") { transitive = false }
47+
modImplementation "io.github.cottonmc:LibCD:2.5.0+1.16.1"
4848
include "io.github.cottonmc:Jankson-Fabric:2.0.1+j1.2.0"
4949

5050
compileOnly ("com.google.code.findbugs:jsr305:3.0.2") { transitive = false }

‎modules/cotton-cauldron/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
6-
version = "1.0.3"
6+
version = "1.0.4"
77

88
ext {
99
module_dependencies = [

‎modules/cotton-cauldron/src/main/java/io/github/cottonmc/cotton/cauldron/CauldronContext.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import net.minecraft.fluid.Fluid;
77
import net.minecraft.item.ItemStack;
88
import net.minecraft.state.property.Properties;
9-
import net.minecraft.util.DefaultedList;
109
import net.minecraft.util.Hand;
10+
import net.minecraft.util.collection.DefaultedList;
1111
import net.minecraft.util.math.BlockPos;
1212
import net.minecraft.world.World;
1313

‎modules/cotton-cauldron/src/main/java/io/github/cottonmc/cotton/cauldron/mixins/MixinCauldronBehavior.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@
1212
import net.minecraft.item.ItemStack;
1313
import net.minecraft.tag.FluidTags;
1414
import net.minecraft.util.ActionResult;
15-
import net.minecraft.util.DefaultedList;
1615
import net.minecraft.util.Hand;
16+
import net.minecraft.util.collection.DefaultedList;
1717
import net.minecraft.util.hit.BlockHitResult;
1818
import net.minecraft.util.math.BlockPos;
1919
import net.minecraft.world.World;

‎modules/cotton-cauldron/src/main/java/io/github/cottonmc/cotton/cauldron/tweaker/WrappedCauldronContext.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,14 @@
1111
import net.minecraft.entity.player.PlayerEntity;
1212
import net.minecraft.fluid.Fluid;
1313
import net.minecraft.item.ItemStack;
14+
import net.minecraft.server.network.ServerPlayerEntity;
1415
import net.minecraft.server.world.ServerWorld;
1516
import net.minecraft.sound.SoundCategory;
1617
import net.minecraft.stat.Stats;
1718
import net.minecraft.util.Hand;
1819
import net.minecraft.util.Identifier;
1920
import net.minecraft.util.math.BlockPos;
21+
import net.minecraft.util.math.Vec3d;
2022
import net.minecraft.util.registry.Registry;
2123
import net.minecraft.world.World;
2224

@@ -184,13 +186,17 @@ public void spawnEntity(String entityType) {
184186
BlockPos pos = context.getPos();
185187
EntityType<?> type = Registry.ENTITY_TYPE.get(new Identifier(entityType));
186188
if (type.equals(EntityType.LIGHTNING_BOLT) && world instanceof ServerWorld) {
187-
LightningEntity lightning = new LightningEntity(world, pos.getX(), pos.getY(), pos.getZ(), false);
188-
((ServerWorld)world).addLightning(lightning);
189+
LightningEntity lightning = EntityType.LIGHTNING_BOLT.create(world);
190+
lightning.method_29495(Vec3d.ofBottomCenter(pos));
191+
if (context.getPlayer() instanceof ServerPlayerEntity) {
192+
lightning.setChanneler((ServerPlayerEntity)context.getPlayer());
193+
}
194+
world.spawnEntity(lightning);
189195
} else {
190196
Entity entity = type.create(world);
191197
if (entity == null) return;
192-
if (type.getCategory() == EntityCategory.MONSTER) {
193-
((MobEntity)entity).initialize(world, world.getLocalDifficulty(pos), SpawnType.EVENT, null, null);
198+
if (type.getSpawnGroup() == SpawnGroup.MONSTER) {
199+
((MobEntity)entity).initialize(world, world.getLocalDifficulty(pos), SpawnReason.EVENT, null, null);
194200
}
195201
entity.setPos(pos.getX()+0.5, pos.getY()+1, pos.getZ()+0.5);
196202
world.spawnEntity(entity);

‎modules/cotton-commons/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
66

@@ -15,6 +15,6 @@ apply from: "../module-base.gradle"
1515

1616

1717
dependencies {
18-
modImplementation "net.fabricmc.fabric-api:fabric-item-groups-v0:0.1.4+b7f9825de4"
19-
modImplementation "net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.1.2+b7f9825de4"
18+
modImplementation "net.fabricmc.fabric-api:fabric-item-groups-v0:0.2.0+0121bd900c"
19+
modImplementation "net.fabricmc.fabric-api:fabric-tag-extensions-v0:0.2.7+a4c57d8e02"
2020
}

‎modules/cotton-commons/src/main/java/io/github/cottonmc/cotton/commons/CottonCommons.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
import io.github.cottonmc.cotton.config.ConfigManager;
44
import io.github.cottonmc.cotton.logging.ModLogger;
55
import net.fabricmc.api.ModInitializer;
6-
import net.fabricmc.fabric.api.client.itemgroup.FabricItemGroupBuilder;
7-
import net.minecraft.block.Blocks;
8-
import net.minecraft.item.ItemGroup;
9-
import net.minecraft.item.ItemStack;
10-
import net.minecraft.util.Identifier;
116

127
public class CottonCommons implements ModInitializer {
138

‎modules/cotton-config/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
66

‎modules/cotton-datapack/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
66

@@ -10,12 +10,12 @@ ext {
1010
];
1111
}
1212

13-
version = "1.0.1";
13+
version = "1.0.4";
1414
apply from: "../module-base.gradle"
1515

1616
dependencies {
17-
modImplementation "net.fabricmc.fabric-api:fabric-api-base:0.1.2+b7f9825d95"
18-
modImplementation "net.fabricmc.fabric-api:fabric-commands-v0:0.1.2+b7f9825de4"
17+
modImplementation "net.fabricmc.fabric-api:fabric-api-base:0.1.3+12a8474c02"
18+
modImplementation "net.fabricmc.fabric-api:fabric-command-api-v1:1.0.8+5ce5339802"
1919

2020
testImplementation "org.junit.jupiter:junit-jupiter-api:5.4.1"
2121
testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.4.1"

‎modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/CottonDatapack.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import io.github.cottonmc.cotton.datapack.recipe.CottonRecipes;
66
import io.github.cottonmc.cotton.datapack.recipe.RecipeUtil;
77
import io.github.cottonmc.cotton.datapack.virtual.PackPrinterCommand;
8-
import net.fabricmc.fabric.api.registry.CommandRegistry;
8+
import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
99
import io.github.cottonmc.cotton.logging.ModLogger;
1010
import net.fabricmc.api.ModInitializer;
1111
import net.fabricmc.loader.api.FabricLoader;
@@ -32,7 +32,7 @@ public void onInitialize() {
3232
RecipeUtil.init(config);
3333

3434
//register the command that prints out the virtual data and resource packs.
35-
CommandRegistry.INSTANCE.register(false, new PackPrinterCommand());
35+
CommandRegistrationCallback.EVENT.register((commandDispatcher, b) -> new PackPrinterCommand().accept(commandDispatcher) );
3636

3737
// EXAMPLE CODE START
3838

‎modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/GlobalResourcePackProvider.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.io.File;
77
import java.io.FileFilter;
88
import java.util.Map;
9+
import java.util.function.Consumer;
910
import java.util.function.Supplier;
1011

1112
public class GlobalResourcePackProvider implements ResourcePackProvider {
@@ -20,7 +21,7 @@ public GlobalResourcePackProvider() {
2021
this.packsFolder = new File(FabricLoader.getInstance().getGameDirectory(), "datapacks");
2122
}
2223

23-
public <T extends ResourcePackProfile> void register(Map<String, T> packMap, ResourcePackProfile.Factory<T> factory) {
24+
public <T extends ResourcePackProfile> void register(Consumer<T> packConsumer, ResourcePackProfile.Factory<T> factory) {
2425
if (!this.packsFolder.isDirectory()) {
2526
this.packsFolder.mkdirs();
2627
}
@@ -30,9 +31,9 @@ public <T extends ResourcePackProfile> void register(Map<String, T> packMap, Res
3031

3132
for(File file : files) {
3233
String name = "global/" + file.getName();
33-
T container = ResourcePackProfile.of(name, false, this.createResourcePack(file), factory, ResourcePackProfile.InsertionPosition.TOP);
34+
T container = ResourcePackProfile.of(name, false, this.createResourcePack(file), factory, ResourcePackProfile.InsertionPosition.TOP, ResourcePackSource.method_29486("global"));
3435
if (container != null) {
35-
packMap.put(name, container);
36+
packConsumer.accept(container);
3637
}
3738
}
3839

‎modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/mixins/MixinClientBuiltinResourcePackProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
1111

1212
import java.util.Map;
13+
import java.util.function.Consumer;
1314

1415
/*
1516
Virtual resource packs are injected here to get them in before scanning,
@@ -19,10 +20,10 @@
1920
public class MixinClientBuiltinResourcePackProvider {
2021
@Inject(method = "register", at = @At("RETURN"))
2122
private <T extends ResourcePackProfile> void addVirtualPacks(
22-
Map<String, T> registry, ResourcePackProfile.Factory<T> factory, CallbackInfo info
23+
Consumer<T> consumer, ResourcePackProfile.Factory<T> factory, CallbackInfo info
2324
) {
2425
VirtualResourcePackManager.INSTANCE
2526
.getCreatorForType(ResourceType.CLIENT_RESOURCES)
26-
.register(registry, factory);
27+
.register(consumer, factory);
2728
}
2829
}

‎modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/recipe/RecipeUtil.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public ProductRemovalPredicate(ItemStack stack) {
6363

6464
@Override
6565
public boolean test(Recipe<?> t) {
66-
return ItemStack.areEqualIgnoreDamage(t.getOutput(), product);
66+
return ItemStack.areEqual(t.getOutput(), product);
6767
}
6868
}
6969
}

‎modules/cotton-datapack/src/main/java/io/github/cottonmc/cotton/datapack/virtual/VirtualResourcePackManager.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,12 @@
66
import com.google.common.collect.MultimapBuilder;
77
import net.minecraft.resource.ResourcePackProfile;
88
import net.minecraft.resource.ResourcePackProvider;
9+
import net.minecraft.resource.ResourcePackSource;
910
import net.minecraft.resource.ResourceType;
1011
import net.minecraft.util.Identifier;
1112

1213
import java.util.*;
14+
import java.util.function.Consumer;
1315

1416
/**
1517
* Manages virtual resource packs. See {@link #addPack(VirtualResourcePack, Collection)} for registering packs.
@@ -23,7 +25,7 @@ public enum VirtualResourcePackManager {
2325
public ResourcePackProvider getCreatorForType(ResourceType type) {
2426
return new ResourcePackProvider() {
2527
@Override
26-
public <T extends ResourcePackProfile> void register(Map<String, T> map, ResourcePackProfile.Factory<T> factory) {
28+
public <T extends ResourcePackProfile> void register(Consumer<T> packConsumer, ResourcePackProfile.Factory<T> factory) {
2729
for (PackContainer packContainer : packs.get(type)) {
2830
VirtualResourcePack pack = packContainer.getPack();
2931
ClientResourcePackMode clientPackMode = packContainer.getClientPackMode();
@@ -33,10 +35,11 @@ public <T extends ResourcePackProfile> void register(Map<String, T> map, Resourc
3335
type == ResourceType.CLIENT_RESOURCES && clientPackMode == ClientResourcePackMode.ALWAYS_ENABLED,
3436
() -> pack,
3537
factory,
36-
ResourcePackProfile.InsertionPosition.TOP
38+
ResourcePackProfile.InsertionPosition.TOP,
39+
ResourcePackSource.method_29486("virtual")
3740
);
3841
if (container != null) {
39-
map.put(id, container);
42+
packConsumer.accept(container);
4043
}
4144
}
4245
}

‎modules/cotton-logging/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
66
version = "1.0.0-rc.4";

‎modules/cotton-player-events/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
plugins {
22
id "com.jfrog.artifactory" version "4.9.0"
3-
id "fabric-loom" version "0.2.7-SNAPSHOT"
3+
id "fabric-loom" version "0.4-SNAPSHOT"
44
id "maven-publish"
55
}
66
version = "1.0.2";
77
apply from: "../module-base.gradle"
88

99
dependencies {
10-
modImplementation "net.fabricmc.fabric-api:fabric-api-base:0.1.2+b7f9825de4"
10+
modImplementation "net.fabricmc.fabric-api:fabric-api-base:0.1.3+12a8474c02"
1111
}

‎modules/cotton-player-events/src/main/java/io/github/cottonmc/cotton/playerevents/PlayerDamageCallback.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import net.minecraft.util.ActionResult;
88
import net.minecraft.util.profiler.Profiler;
99

10+
@Deprecated
1011
public interface PlayerDamageCallback {
1112
//TODO: priority system instead, voting is bad
1213
public static final Event<PlayerDamageCallback> EVENT = EventFactory.createArrayBacked(PlayerDamageCallback.class,

‎modules/module-base.gradle

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
def minecraftVersion = "1.15.2"
2-
def yarnMappings = "1.15.2+build.3:v2"
3-
def loaderVersion = "0.7.8+build.184"
1+
def minecraftVersion = "1.16.1"
2+
def yarnMappings = "1.16.1+build.9:v2"
3+
def loaderVersion = "0.8.8+build.202"
44

55
//Publishing details
66
if (rootProject.file("../../private.gradle").exists()) {
@@ -50,7 +50,6 @@ dependencies {
5050
break;
5151
case "libcd":
5252
dependencyString = "io.github.cottonmc:LibCD:"+modversion;
53-
shouldCarry = false
5453
break;
5554
default:
5655
break;

0 commit comments

Comments
 (0)