Skip to content

Commit b44bc40

Browse files
rubensworksrubensworks
committed
Update to MC 26.2
1 parent 893a5cd commit b44bc40

10 files changed

Lines changed: 45 additions & 38 deletions

File tree

‎build.gradle‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
1+
buildscript {
2+
configurations.classpath {
3+
resolutionStrategy {
4+
force 'net.minecraftforge:srgutils:0.6.2'
5+
}
6+
}
7+
}
8+
19
plugins {
210
id 'net.darkhax.curseforgegradle' version '1.1.28' apply false
311
id 'com.diffplug.spotless' version '6.25.0' apply false
412
id 'com.modrinth.minotaur' version '2.+' apply false
513

6-
id 'net.fabricmc.fabric-loom' version '1.15-SNAPSHOT' apply false
14+
id 'net.fabricmc.fabric-loom' version '1.17-SNAPSHOT' apply false
715
id 'net.neoforged.moddev' version '2.0.141' apply false
816
id 'net.minecraftforge.accesstransformers' version '5.0.3' apply false
917
id 'net.minecraftforge.gradle' version '[7.0.21,8.0)' apply false

‎buildSrc/src/main/groovy/multiloader-loader-forge.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ repositories {
2121

2222
dependencies {
2323
implementation minecraft.dependency("net.minecraftforge:forge:${minecraft_version}-${forge_version}")
24-
annotationProcessor 'net.minecraftforge:eventbus-validator:7.0-beta.10'
24+
annotationProcessor 'net.minecraftforge:eventbus-validator:7.0.5'
2525
annotationProcessor 'org.spongepowered:mixin:0.8.7:processor'
2626

2727
testImplementation "junit:junit:4.12"

‎gradle.properties‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ group=org.cyclops.energeticsheep
44
java_version=25
55

66
# Common
7-
minecraft_version=26.1.2
7+
minecraft_version=26.2
88
mod_name=EnergeticSheep
99
mod_author=rubensworks (aka kroeser)
1010
mod_id=energeticsheep
@@ -14,27 +14,27 @@ issue_tracker_url=https://github.com/CyclopsMC/EnergeticSheep/issues
1414
display_url=https://www.curseforge.com/minecraft/mc-mods/energeticsheep
1515
description=Sheep that generate energy
1616
fingerprint=bd0353b3e8a2810d60dd584e256e364bc3bedd44
17-
neo_form_version=26.1.2-1
17+
neo_form_version=26.2-1
1818
curseforge_project_id=280602
1919
modrinth_project_id=TC6LFnue
2020

2121
# Fabric
22-
fabric_version=0.146.1+26.1.2
23-
fabric_loader_version=0.18.5
22+
fabric_version=0.152.2+26.2
23+
fabric_loader_version=0.19.3
2424
# Dependencies
25-
fabric_forgeconfigapiport_version=26.1.3
25+
fabric_forgeconfigapiport_version=26.2.0
2626
# https://maven.fabricmc.net/teamreborn/energy/
2727
fabric_teamrebornenergy_version=5.0.0
2828
# https://maven.fabricmc.net/TechReborn/
2929
fabric_techreborn_version=TechReborn-1.21.10:5.15.0
3030

3131
# NeoForge
32-
neoforge_version=26.1.2.22-beta
32+
neoforge_version=26.2.0.6-beta
3333
neoforge_loader_version_range=[4,)
3434
neoforge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/neoforge_update/energeticsheep.json
3535

3636
# Forge
37-
forge_version=64.0.4
37+
forge_version=65.0.0
3838
forge_loader_version_range=[2,)
3939
forge_update_json_url=https://raw.githubusercontent.com/CyclopsMC/Versions/master/forge_update/energeticsheep.json
4040

@@ -44,4 +44,4 @@ org.gradle.daemon=false
4444
org.gradle.caching=true
4545

4646
# Common dependencies
47-
cyclopscore_version=1.29.5-1012
47+
cyclopscore_version=1.30.0-1038

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.0-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip
44
networkTimeout=10000
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

‎loader-common/src/main/java/org/cyclops/energeticsheep/entity/EntityEnergeticSheepCommon.java‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import com.google.common.collect.Lists;
44
import com.google.common.collect.Maps;
5-
import net.minecraft.util.Util;
65
import net.minecraft.core.BlockPos;
76
import net.minecraft.core.particles.ParticleTypes;
87
import net.minecraft.core.particles.SpellParticleOption;
@@ -11,22 +10,20 @@
1110
import net.minecraft.network.syncher.EntityDataAccessor;
1211
import net.minecraft.network.syncher.EntityDataSerializers;
1312
import net.minecraft.network.syncher.SynchedEntityData;
14-
import net.minecraft.resources.ResourceKey;
1513
import net.minecraft.resources.Identifier;
14+
import net.minecraft.resources.ResourceKey;
1615
import net.minecraft.server.level.ServerLevel;
1716
import net.minecraft.sounds.SoundEvents;
1817
import net.minecraft.sounds.SoundSource;
1918
import net.minecraft.util.RandomSource;
19+
import net.minecraft.util.Util;
2020
import net.minecraft.world.DifficultyInstance;
2121
import net.minecraft.world.InteractionHand;
2222
import net.minecraft.world.InteractionResult;
23-
import net.minecraft.world.entity.AgeableMob;
24-
import net.minecraft.world.entity.EntitySpawnReason;
25-
import net.minecraft.world.entity.animal.Animal;
26-
import net.minecraft.world.entity.EntityType;
27-
import net.minecraft.world.entity.SpawnGroupData;
23+
import net.minecraft.world.entity.*;
2824
import net.minecraft.world.entity.ai.attributes.Attributes;
2925
import net.minecraft.world.entity.ai.goal.BreedGoal;
26+
import net.minecraft.world.entity.animal.Animal;
3027
import net.minecraft.world.entity.animal.sheep.Sheep;
3128
import net.minecraft.world.entity.item.ItemEntity;
3229
import net.minecraft.world.entity.player.Player;
@@ -272,7 +269,7 @@ public float getVoicePitch() {
272269
@Override
273270
public Optional<ResourceKey<LootTable>> getLootTable() {
274271
if (this.isSheared()) {
275-
return EntityType.SHEEP.getDefaultLootTable();
272+
return EntityTypes.SHEEP.getDefaultLootTable();
276273
} else {
277274
switch (this.getColor()) {
278275
case WHITE:

‎loader-common/src/main/java/org/cyclops/energeticsheep/gametest/GameTestsCommon.java‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
import net.minecraft.world.entity.AgeableMob;
1313
import net.minecraft.world.entity.EntitySpawnReason;
1414
import net.minecraft.world.entity.EntityType;
15+
import net.minecraft.world.entity.EntityTypes;
1516
import net.minecraft.world.entity.animal.sheep.Sheep;
1617
import net.minecraft.world.entity.player.Player;
1718
import net.minecraft.world.item.DyeColor;
@@ -24,12 +25,13 @@
2425
import net.minecraft.world.level.block.entity.DispenserBlockEntity;
2526
import net.minecraft.world.level.block.state.BlockState;
2627
import net.minecraft.world.phys.BlockHitResult;
27-
import org.cyclops.energeticsheep.entity.EntityEnergeticSheepConfigCommon;
28+
import net.minecraft.world.phys.Vec3;
2829
import org.cyclops.cyclopscore.gametest.GameTest;
2930
import org.cyclops.energeticsheep.Reference;
3031
import org.cyclops.energeticsheep.RegistryEntries;
3132
import org.cyclops.energeticsheep.entity.EntityAIEatGrassFast;
3233
import org.cyclops.energeticsheep.entity.EntityEnergeticSheepCommon;
34+
import org.cyclops.energeticsheep.entity.EntityEnergeticSheepConfigCommon;
3335

3436
/**
3537
* @author rubensworks
@@ -72,7 +74,7 @@ public void testShearEnergetic(GameTestHelper helper) {
7274

7375
// Give energetic shears to player
7476
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
75-
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
77+
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
7678
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack);
7779

7880
helper.succeedWhen(() -> {
@@ -133,14 +135,14 @@ public void testShearEnergeticLeavesWithPower(GameTestHelper helper) {
133135

134136
// Give energetic shears with power to player
135137
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
136-
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
138+
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
137139
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack);
138140
RegistryEntries.ITEM_ENERGETIC_SHEARS.value().setEnergyStored(itemStack, RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getMaxEnergyStored(itemStack), player, player.getUsedItemHand());
139141

140142
helper.succeedWhen(() -> {
141143
// Break leaves with energetic shears
142144
BlockState blockState = helper.getBlockState(POS);
143-
InteractionResult interactionResult = itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(POS.getCenter(), Direction.NORTH, helper.absolutePos(POS), false)));
145+
InteractionResult interactionResult = itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(Vec3.atCenterOf(POS), Direction.NORTH, helper.absolutePos(POS), false)));
144146
helper.assertFalse(interactionResult == InteractionResult.FAIL, Component.literal("Interaction must succeed"));
145147
helper.assertTrue(itemStack.getItem().mineBlock(itemStack, helper.getLevel(), blockState, helper.absolutePos(POS), player), Component.literal("Item can not mine block"));
146148
helper.assertTrue(player.hasCorrectToolForDrops(blockState), Component.literal("Player must have correct tool"));
@@ -158,12 +160,12 @@ public void testShearEnergeticLeavesNoPower(GameTestHelper helper) {
158160

159161
// Give energetic shears without power to player
160162
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
161-
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
163+
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
162164
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack);
163165

164166
helper.succeedWhen(() -> {
165167
// Attempt to break leaves with energetic shears that has no power
166-
InteractionResult interactionResult = itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(POS.getCenter(), Direction.NORTH, helper.absolutePos(POS), false)));
168+
InteractionResult interactionResult = itemStack.useOn(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(Vec3.atCenterOf(POS), Direction.NORTH, helper.absolutePos(POS), false)));
167169
helper.assertFalse(interactionResult == InteractionResult.FAIL, Component.literal("Interaction must fail"));
168170

169171
helper.assertItemEntityNotPresent(Items.ACACIA_LEAVES);
@@ -178,14 +180,14 @@ public void testShearEnergeticWithPowerRegularSheep(GameTestHelper helper) {
178180

179181
// Give energetic shears to player
180182
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
181-
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
183+
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
182184
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack);
183185
RegistryEntries.ITEM_ENERGETIC_SHEARS.value().setEnergyStored(itemStack, RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getMaxEnergyStored(itemStack), player, player.getUsedItemHand());
184186

185187
helper.succeedWhen(() -> {
186188
// Right click with energetic shears
187189
InteractionResult result = player.interactOn(entity, InteractionHand.MAIN_HAND, entity.position());
188-
helper.assertItemEntityPresent(Items.WHITE_WOOL);
190+
helper.assertItemEntityPresent(Items.WOOL.white());
189191
helper.assertTrue(RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getEnergyStored(player.getMainHandItem()) < RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getMaxEnergyStored(player.getMainHandItem()), Component.literal("No energy was consumed from shears"));
190192
helper.assertTrue(result.equals(InteractionResult.SUCCESS), Component.literal("Interaction failed"));
191193
});
@@ -198,13 +200,13 @@ public void testShearEnergeticNoPowerRegularSheep(GameTestHelper helper) {
198200

199201
// Give energetic shears to player
200202
Player player = helper.makeMockPlayer(GameType.SURVIVAL);
201-
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
203+
ItemStack itemStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
202204
player.setItemInHand(InteractionHand.MAIN_HAND, itemStack);
203205

204206
helper.succeedWhen(() -> {
205207
// Right click with energetic shears
206208
InteractionResult result = player.interactOn(entity, InteractionHand.MAIN_HAND, entity.position());
207-
helper.assertItemEntityNotPresent(Items.WHITE_WOOL);
209+
helper.assertItemEntityNotPresent(Items.WOOL.white());
208210
helper.assertTrue(RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getEnergyStored(player.getMainHandItem()) == 0, Component.literal("Shears do not have enough energy"));
209211
helper.assertTrue(result.equals(InteractionResult.PASS), Component.literal("Interaction did not pass"));
210212
});
@@ -393,7 +395,7 @@ public void testDispenseEnergeticShears(GameTestHelper helper) {
393395

394396
// Put energetic shears (empty, no charge) into the dispenser
395397
DispenserBlockEntity dispenserBlockEntity = (DispenserBlockEntity) helper.getLevel().getBlockEntity(helper.absolutePos(dispenserPos));
396-
ItemStack shearsStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
398+
ItemStack shearsStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
397399
dispenserBlockEntity.setItem(0, shearsStack);
398400

399401
helper.succeedWhen(() -> {
@@ -418,14 +420,14 @@ public void testDispenseEnergeticShearsOnRegularSheep(GameTestHelper helper) {
418420
helper.setBlock(dispenserPos, Blocks.DISPENSER.defaultBlockState().setValue(DispenserBlock.FACING, Direction.EAST));
419421

420422
// Spawn regular white sheep directly in front of the dispenser (at POS)
421-
Sheep entity = helper.spawn(EntityType.SHEEP, POS);
423+
Sheep entity = helper.spawn(EntityTypes.SHEEP, POS);
422424
entity.finalizeSpawn(helper.getLevel(), helper.getLevel().getCurrentDifficultyAt(helper.absolutePos(POS)), EntitySpawnReason.NATURAL, null);
423425
entity.setColor(DyeColor.WHITE);
424426

425427
// Put energetic shears (fully charged) into the dispenser
426428
DispenserBlockEntity dispenserBlockEntity = (DispenserBlockEntity) helper.getLevel().getBlockEntity(helper.absolutePos(dispenserPos));
427429
Player tempPlayer = helper.makeMockPlayer(GameType.SURVIVAL);
428-
ItemStack shearsStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS);
430+
ItemStack shearsStack = new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder());
429431
tempPlayer.setItemInHand(InteractionHand.MAIN_HAND, shearsStack);
430432
RegistryEntries.ITEM_ENERGETIC_SHEARS.value().setEnergyStored(shearsStack, RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getMaxEnergyStored(shearsStack), tempPlayer, InteractionHand.MAIN_HAND);
431433
dispenserBlockEntity.setItem(0, tempPlayer.getMainHandItem());
@@ -439,7 +441,7 @@ public void testDispenseEnergeticShearsOnRegularSheep(GameTestHelper helper) {
439441
dispenserBlockEntity.setItem(0, result);
440442

441443
// Regular wool should have been dropped
442-
helper.assertItemEntityPresent(Items.WHITE_WOOL);
444+
helper.assertItemEntityPresent(Items.WOOL.white());
443445
// Some energy should have been consumed from the shears
444446
helper.assertTrue(RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getEnergyStored(result) < RegistryEntries.ITEM_ENERGETIC_SHEARS.value().getMaxEnergyStored(result), Component.literal("Energy should have been consumed from shears after shearing regular sheep"));
445447
});
@@ -453,7 +455,7 @@ protected static EntityEnergeticSheepCommon SPAWN(GameTestHelper helper) {
453455
}
454456

455457
protected static Sheep SPAWN_REGULAR(GameTestHelper helper) {
456-
Sheep entity = helper.spawn(EntityType.SHEEP, POS.above());
458+
Sheep entity = helper.spawn(EntityTypes.SHEEP, POS.above());
457459
entity.finalizeSpawn(helper.getLevel(), helper.getLevel().getCurrentDifficultyAt(POS), EntitySpawnReason.NATURAL, null);
458460
return entity;
459461
}

‎loader-fabric/src/main/java/org/cyclops/energeticsheep/EnergeticSheepFabric.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected ICommonProxyCommon constructCommonProxy() {
5050
@Override
5151
protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
5252
return super.constructDefaultCreativeModeTab(builder)
53-
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS));
53+
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder()));
5454
}
5555

5656
@Override

‎loader-fabric/src/main/java/org/cyclops/energeticsheep/mixin/MixinItemPredicate.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package org.cyclops.energeticsheep.mixin;
22

3-
import net.minecraft.advancements.criterion.ItemPredicate;
3+
import net.minecraft.advancements.predicates.ItemPredicate;
44
import net.minecraft.resources.Identifier;
55
import net.minecraft.world.item.ItemInstance;
66
import org.cyclops.energeticsheep.RegistryEntries;

‎loader-forge/src/main/java/org/cyclops/energeticsheep/EnergeticSheepForge.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ protected boolean hasDefaultCreativeModeTab() {
5252
@Override
5353
protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
5454
return super.constructDefaultCreativeModeTab(builder)
55-
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS));
55+
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder()));
5656
}
5757

5858
@Override

‎loader-neoforge/src/main/java/org/cyclops/energeticsheep/EnergeticSheepNeoForge.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ protected ICommonProxy constructCommonProxy() {
4848
@Override
4949
protected CreativeModeTab.Builder constructDefaultCreativeModeTab(CreativeModeTab.Builder builder) {
5050
return super.constructDefaultCreativeModeTab(builder)
51-
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS));
51+
.icon(() -> new ItemStack(RegistryEntries.ITEM_ENERGETIC_SHEARS.getHolder()));
5252
}
5353

5454
@Override

0 commit comments

Comments
 (0)