Skip to content

Commit e10ab33

Browse files
committed
Fix late-init registry.
1 parent 1cb7979 commit e10ab33

File tree

4 files changed

+11
-5
lines changed

4 files changed

+11
-5
lines changed

src/main/java/org/flenarn/NetherAdditions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import net.minecraft.util.Identifier;
66
import org.flenarn.block.NetherAdditionsBlocks;
77
import org.flenarn.entity.effect.NetherAdditionsStatusEffects;
8+
import org.flenarn.entity.projectile.NetherAdditionsEntityTypes;
89
import org.flenarn.item.NetherAdditionsItemGroups;
910
import org.flenarn.item.NetherAdditionsItems;
1011
import org.flenarn.item.NetherAdditionsPotions;
@@ -28,6 +29,7 @@ public void onInitialize() {
2829
NetherAdditionsPotions.registerPotionRecipes();
2930
NetherAdditionsLootTables.registerLootTables();
3031
NetherAdditionsStatusEffects.registeringStatusEffects();
32+
NetherAdditionsEntityTypes.registerEntities();
3133
}
3234

3335
public static Identifier getModId(String id){

src/main/java/org/flenarn/entity/projectile/NetherAdditionsEntityTypes.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,8 @@ public static <T extends Entity> EntityType<T> registerEntityType(String path, E
2727

2828
return Registry.register(Registries.ENTITY_TYPE, key, entityTypeBuilder.build(key));
2929
}
30-
}
30+
31+
public static void registerEntities() {
32+
NetherAdditions.LOGGER.info("Registering entity types for " + NetherAdditions.MOD_ID + ".");
33+
}
34+
}

src/main/java/org/flenarn/entity/projectile/custom/WeepingFishingBobberEntity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public WeepingFishingBobberEntity(EntityType<? extends FishingBobberEntity> type
3939
super(type, world, luckBonus, waitTimeReductionTicks);
4040
}
4141

42-
public WeepingFishingBobberEntity(PlayerEntity thrower, World world, int luckBonus, int waitTimeReductionTicks, ItemStack itemStack) {
42+
public WeepingFishingBobberEntity(PlayerEntity thrower, World world, int luckBonus, int waitTimeReductionTicks) {
4343
this(NetherAdditionsEntityTypes.WEEPING_FISHING_BOBBER_ENTITY_TYPE, world, luckBonus, waitTimeReductionTicks);
4444
this.setOwner(thrower);
4545
float thrownPitch = thrower.getPitch();
@@ -277,9 +277,9 @@ public int use(ItemStack usedItem) {
277277
this.getWorld().sendEntityStatus(this, (byte) 31);
278278
i = this.hookedEntity instanceof ItemEntity ? 3 : 5;
279279
} else if (this.hookCountdown > 0) {
280-
LootWorldContext lootContextParameterSet = (new LootWorldContext.Builder((ServerWorld)this.getWorld())).add(LootContextParameters.ORIGIN, this.getPos()).add(LootContextParameters.TOOL, usedItem).add(LootContextParameters.THIS_ENTITY, this).luck((float)this.luckBonus + playerEntity.getLuck()).build(LootContextTypes.FISHING);
280+
LootWorldContext lootWorldContext = (new LootWorldContext.Builder((ServerWorld)this.getWorld())).add(LootContextParameters.ORIGIN, this.getPos()).add(LootContextParameters.TOOL, usedItem).add(LootContextParameters.THIS_ENTITY, this).luck((float)this.luckBonus + playerEntity.getLuck()).build(LootContextTypes.FISHING);
281281
LootTable lootTable = this.getWorld().getServer().getReloadableRegistries().getLootTable(NetherAdditionsLootTables.LAVA_FISHING_GAMEPLAY);
282-
List<ItemStack> list = lootTable.generateLoot(lootContextParameterSet);
282+
List<ItemStack> list = lootTable.generateLoot(lootWorldContext);
283283
Criteria.FISHING_ROD_HOOKED.trigger((ServerPlayerEntity)playerEntity, usedItem, this, list);
284284

285285
for (ItemStack itemStack : list) {

src/main/java/org/flenarn/item/custom/WeepingFishingRodItem.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public ActionResult use(World world, PlayerEntity user, Hand hand) {
3939
ServerWorld serverWorld = (ServerWorld) world;
4040
int i = (int) (EnchantmentHelper.getFishingTimeReduction(serverWorld, itemStack, user) * 20.0F);
4141
int j = EnchantmentHelper.getFishingLuckBonus(serverWorld, itemStack, user);
42-
ProjectileEntity.spawn(new WeepingFishingBobberEntity(user, world, j, i, itemStack), serverWorld, itemStack);
42+
ProjectileEntity.spawn(new WeepingFishingBobberEntity(user, world, j, i), serverWorld, itemStack);
4343
}
4444

4545
user.incrementStat(Stats.USED.getOrCreateStat(this));

0 commit comments

Comments
 (0)