From a2cce5b33381a31da9f77e37cd872dd60e61d877 Mon Sep 17 00:00:00 2001 From: IThundxr Date: Wed, 4 Sep 2024 12:23:09 -0400 Subject: [PATCH] Refactors I --- .../api/bogeymenu/v0/entry/CategoryEntry.java | 1 - .../RailwaysSequencedAssemblyRecipeGen.java | 27 +++--- .../base/datafixers/CompatCherryTrackFix.java | 18 ++++ .../compat/tracks/GenericTrackCompat.java | 6 +- .../tracks/mods/NaturesSpiritTrackCompat.java | 18 ++++ .../compat/tracks/mods/TFCTrackCompat.java | 24 +++++- .../mixin/AccessorCreativeModeTabs.java | 18 ++++ ....java => AccessorIngredient$TagValue.java} | 2 +- .../railways/mixin/MixinDataFixTypes.java | 18 ++++ .../client/AccessorWalkAnimationState.java | 18 ++++ .../client/MixinKeyBindsListKeyEntry.java | 18 ++++ .../mixin/client/MixinSpriteContents.java | 18 ++++ .../mixin_interfaces/AnimatedTextureDuck.java | 18 ++++ .../IPotentiallyInvisibleSpriteContents.java | 18 ++++ .../railways/registry/CRBlockPartials.java | 4 +- .../railways/registry/CRBogeyStyles.java | 47 +++++++---- .../railways/registry/CRCommands.java | 54 ++++++------ .../railways/registry/CRCommandsClient.java | 83 +++++++++---------- .../railways/registry/CRContainerTypes.java | 29 +++---- .../railways/registry/CRCreativeModeTabs.java | 18 ++++ .../railways/registry/CREntities.java | 68 +++++++-------- .../railways/registry/CRParticleTypes.java | 2 - .../railways/registry/CRPonderIndex.java | 3 +- .../railways/registry/CRSchedule.java | 1 - .../railwayteam/railways/registry/CRTags.java | 4 +- .../commands/ReloadCreativeTabsCommand.java | 18 ++++ .../railwayteam/railways/util/MathUtils.java | 18 ++++ .../resources/railways-common.mixins.json | 2 +- .../registry/fabric/CRBogeyStylesImpl.java | 27 ------ .../registry/forge/CRBogeyStylesImpl.java | 28 ------- 30 files changed, 412 insertions(+), 216 deletions(-) rename common/src/main/java/com/railwayteam/railways/mixin/{AccessorIngredient_TagValue.java => AccessorIngredient$TagValue.java} (96%) delete mode 100644 fabric/src/main/java/com/railwayteam/railways/registry/fabric/CRBogeyStylesImpl.java delete mode 100644 forge/src/main/java/com/railwayteam/railways/registry/forge/CRBogeyStylesImpl.java diff --git a/common/src/main/java/com/railwayteam/railways/api/bogeymenu/v0/entry/CategoryEntry.java b/common/src/main/java/com/railwayteam/railways/api/bogeymenu/v0/entry/CategoryEntry.java index 40dac0e46..f95df3966 100644 --- a/common/src/main/java/com/railwayteam/railways/api/bogeymenu/v0/entry/CategoryEntry.java +++ b/common/src/main/java/com/railwayteam/railways/api/bogeymenu/v0/entry/CategoryEntry.java @@ -60,7 +60,6 @@ void addToBogeyEntryList(BogeyEntry entry) { } public static class FavoritesCategory extends CategoryEntry { - public static final CategoryEntry INSTANCE = new FavoritesCategory(); @Nullable diff --git a/common/src/main/java/com/railwayteam/railways/base/data/recipe/RailwaysSequencedAssemblyRecipeGen.java b/common/src/main/java/com/railwayteam/railways/base/data/recipe/RailwaysSequencedAssemblyRecipeGen.java index be1b2af09..454d4d023 100644 --- a/common/src/main/java/com/railwayteam/railways/base/data/recipe/RailwaysSequencedAssemblyRecipeGen.java +++ b/common/src/main/java/com/railwayteam/railways/base/data/recipe/RailwaysSequencedAssemblyRecipeGen.java @@ -19,8 +19,7 @@ package com.railwayteam.railways.base.data.recipe; import com.railwayteam.railways.Railways; -import com.railwayteam.railways.mixin.AccessorIngredient_TagValue; -import com.railwayteam.railways.registry.CRBlocks; +import com.railwayteam.railways.mixin.AccessorIngredient$TagValue; import com.railwayteam.railways.registry.CRItems; import com.railwayteam.railways.registry.CRTrackMaterials; import com.railwayteam.railways.util.TextUtils; @@ -117,14 +116,14 @@ protected GeneratedRecipe create(String name, Function { return value instanceof Ingredient.TagValue tagValue - && (((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron")) - || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc")) - || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets")) - || ((AccessorIngredient_TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19 + && (((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron")) + || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc")) + || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets")) + || ((AccessorIngredient$TagValue)tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19 })) { railsIngredient = Ingredient.fromValues(Stream.of( - AccessorIngredient_TagValue.railways$create(Ingredients.ironNugget()), - AccessorIngredient_TagValue.railways$create(Ingredients.zincNugget()))); + AccessorIngredient$TagValue.railways$create(Ingredients.ironNugget()), + AccessorIngredient$TagValue.railways$create(Ingredients.zincNugget()))); } Ingredient finalRailsIngredient = railsIngredient; @@ -146,14 +145,14 @@ protected GeneratedRecipe create(String name, Function { return value instanceof Ingredient.TagValue tagValue - && (((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron")) - || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc")) - || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets")) - || ((AccessorIngredient_TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19 + && (((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/iron")) + || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("nuggets/zinc")) + || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("iron_nuggets")) + || ((AccessorIngredient$TagValue) tagValue).getTag().equals(AllTags.forgeItemTag("zinc_nuggets"))); // TODO wait until create fabric merge such difference between 1.18 and 1.19 })) { railsIngredient = Ingredient.fromValues(Stream.of( - AccessorIngredient_TagValue.railways$create(Ingredients.ironNugget()), - AccessorIngredient_TagValue.railways$create(Ingredients.zincNugget()))); + AccessorIngredient$TagValue.railways$create(Ingredients.ironNugget()), + AccessorIngredient$TagValue.railways$create(Ingredients.zincNugget()))); } Ingredient finalRailsIngredient = railsIngredient; diff --git a/common/src/main/java/com/railwayteam/railways/base/datafixers/CompatCherryTrackFix.java b/common/src/main/java/com/railwayteam/railways/base/datafixers/CompatCherryTrackFix.java index 17a813741..62e245960 100644 --- a/common/src/main/java/com/railwayteam/railways/base/datafixers/CompatCherryTrackFix.java +++ b/common/src/main/java/com/railwayteam/railways/base/datafixers/CompatCherryTrackFix.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.base.datafixers; import com.google.common.collect.ImmutableList; diff --git a/common/src/main/java/com/railwayteam/railways/compat/tracks/GenericTrackCompat.java b/common/src/main/java/com/railwayteam/railways/compat/tracks/GenericTrackCompat.java index d2c97a7bb..d689cd6bf 100644 --- a/common/src/main/java/com/railwayteam/railways/compat/tracks/GenericTrackCompat.java +++ b/common/src/main/java/com/railwayteam/railways/compat/tracks/GenericTrackCompat.java @@ -22,7 +22,7 @@ import com.railwayteam.railways.Railways; import com.railwayteam.railways.compat.Mods; import com.railwayteam.railways.config.CRConfigs; -import com.railwayteam.railways.mixin.AccessorIngredient_TagValue; +import com.railwayteam.railways.mixin.AccessorIngredient$TagValue; import com.railwayteam.railways.multiloader.CommonTags; import com.railwayteam.railways.registry.CRBlocks; import com.railwayteam.railways.registry.CRTrackMaterials; @@ -159,8 +159,8 @@ protected String getLang(String name) { protected Ingredient getIngredientForRail() { return Ingredient.fromValues(Stream.of( - AccessorIngredient_TagValue.railways$create(CommonTags.IRON_NUGGETS.tag), - AccessorIngredient_TagValue.railways$create(CommonTags.ZINC_NUGGETS.tag) + AccessorIngredient$TagValue.railways$create(CommonTags.IRON_NUGGETS.tag), + AccessorIngredient$TagValue.railways$create(CommonTags.ZINC_NUGGETS.tag) )); } diff --git a/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/NaturesSpiritTrackCompat.java b/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/NaturesSpiritTrackCompat.java index ac6fb3cd8..63a09dab8 100644 --- a/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/NaturesSpiritTrackCompat.java +++ b/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/NaturesSpiritTrackCompat.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.compat.tracks.mods; import com.railwayteam.railways.Railways; diff --git a/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/TFCTrackCompat.java b/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/TFCTrackCompat.java index 0f83a5a56..b8a46479e 100644 --- a/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/TFCTrackCompat.java +++ b/common/src/main/java/com/railwayteam/railways/compat/tracks/mods/TFCTrackCompat.java @@ -1,9 +1,27 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.compat.tracks.mods; import com.railwayteam.railways.Railways; import com.railwayteam.railways.compat.Mods; import com.railwayteam.railways.compat.tracks.GenericTrackCompat; -import com.railwayteam.railways.mixin.AccessorIngredient_TagValue; +import com.railwayteam.railways.mixin.AccessorIngredient$TagValue; import net.minecraft.core.registries.Registries; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagKey; @@ -19,8 +37,8 @@ public class TFCTrackCompat extends GenericTrackCompat { @Override protected Ingredient getIngredientForRail() { return Ingredient.fromValues(Stream.of( - AccessorIngredient_TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/wrought_iron"))), - AccessorIngredient_TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/zinc"))) + AccessorIngredient$TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/wrought_iron"))), + AccessorIngredient$TagValue.railways$create(TagKey.create(Registries.ITEM, new ResourceLocation("forge", "rods/zinc"))) )); } diff --git a/common/src/main/java/com/railwayteam/railways/mixin/AccessorCreativeModeTabs.java b/common/src/main/java/com/railwayteam/railways/mixin/AccessorCreativeModeTabs.java index f9702b183..95ed7f1cc 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/AccessorCreativeModeTabs.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/AccessorCreativeModeTabs.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin; import net.minecraft.world.item.CreativeModeTab; diff --git a/common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient_TagValue.java b/common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient$TagValue.java similarity index 96% rename from common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient_TagValue.java rename to common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient$TagValue.java index 3774cb244..ced1e1270 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient_TagValue.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/AccessorIngredient$TagValue.java @@ -26,7 +26,7 @@ import org.spongepowered.asm.mixin.gen.Invoker; @Mixin(Ingredient.TagValue.class) -public interface AccessorIngredient_TagValue { +public interface AccessorIngredient$TagValue { @Invoker("") static Ingredient.TagValue railways$create(TagKey tag) { throw new AssertionError(); diff --git a/common/src/main/java/com/railwayteam/railways/mixin/MixinDataFixTypes.java b/common/src/main/java/com/railwayteam/railways/mixin/MixinDataFixTypes.java index 3b6463f31..a0d7f22f7 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/MixinDataFixTypes.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/MixinDataFixTypes.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin; import com.mojang.datafixers.DataFixer; diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorWalkAnimationState.java b/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorWalkAnimationState.java index d06b4bc08..d5bb1c62e 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorWalkAnimationState.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/client/AccessorWalkAnimationState.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin.client; import net.minecraft.world.entity.WalkAnimationState; diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinKeyBindsListKeyEntry.java b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinKeyBindsListKeyEntry.java index 6091c0f79..c0bb0d4a6 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinKeyBindsListKeyEntry.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinKeyBindsListKeyEntry.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin.client; import com.llamalad7.mixinextras.injector.wrapoperation.Operation; diff --git a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinSpriteContents.java b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinSpriteContents.java index a2684730a..cd7216236 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin/client/MixinSpriteContents.java +++ b/common/src/main/java/com/railwayteam/railways/mixin/client/MixinSpriteContents.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin.client; import com.mojang.blaze3d.platform.NativeImage; diff --git a/common/src/main/java/com/railwayteam/railways/mixin_interfaces/AnimatedTextureDuck.java b/common/src/main/java/com/railwayteam/railways/mixin_interfaces/AnimatedTextureDuck.java index 474e8a9f5..c8d86ba33 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin_interfaces/AnimatedTextureDuck.java +++ b/common/src/main/java/com/railwayteam/railways/mixin_interfaces/AnimatedTextureDuck.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin_interfaces; public interface AnimatedTextureDuck { diff --git a/common/src/main/java/com/railwayteam/railways/mixin_interfaces/IPotentiallyInvisibleSpriteContents.java b/common/src/main/java/com/railwayteam/railways/mixin_interfaces/IPotentiallyInvisibleSpriteContents.java index 90f8ba590..f6d94a067 100644 --- a/common/src/main/java/com/railwayteam/railways/mixin_interfaces/IPotentiallyInvisibleSpriteContents.java +++ b/common/src/main/java/com/railwayteam/railways/mixin_interfaces/IPotentiallyInvisibleSpriteContents.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.mixin_interfaces; public interface IPotentiallyInvisibleSpriteContents { diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRBlockPartials.java b/common/src/main/java/com/railwayteam/railways/registry/CRBlockPartials.java index 2ce63b77b..c0ed37d3a 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRBlockPartials.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRBlockPartials.java @@ -35,7 +35,6 @@ import static com.railwayteam.railways.registry.CRTrackMaterials.CRTrackType.WIDE_GAUGE; public class CRBlockPartials { - public static final Map TOOLBOX_BODIES = new EnumMap<>(DyeColor.class); public static final Map CONDUCTOR_WHISTLE_FLAGS = new EnumMap<>(DyeColor.class); public static final Map CUSTOM_CONDUCTOR_CAPS = new HashMap<>(); @@ -538,6 +537,5 @@ private static PartialModel block(String path) { } @SuppressWarnings("EmptyMethod") - public static void init() { - } + public static void init() {} } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRBogeyStyles.java b/common/src/main/java/com/railwayteam/railways/registry/CRBogeyStyles.java index b89e3328f..fedee3ee9 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRBogeyStyles.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRBogeyStyles.java @@ -22,16 +22,32 @@ import com.railwayteam.railways.Railways; import com.railwayteam.railways.api.bogeymenu.v0.BogeyMenuManager; import com.railwayteam.railways.api.bogeymenu.v0.entry.CategoryEntry; -import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.*; -import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.*; -import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.*; -import com.railwayteam.railways.content.custom_bogeys.special.invisible.InvisibleBogeyRenderer; -import com.railwayteam.railways.content.custom_bogeys.special.monobogey.InvisibleMonoBogeyBlock; -import com.railwayteam.railways.content.custom_bogeys.special.monobogey.MonoBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.narrow.NarrowDoubleScotchYokeBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.narrow.NarrowScotchYokeBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.narrow.NarrowSmallBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.standard.HandcarBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.ArchbarBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.BlombergBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.FreightBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.ModernBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.PassengerBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.double_axle.Y25BogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.LargeCreateStyled0100Renderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.LargeCreateStyled0120Renderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.LargeCreateStyled040Renderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.LargeCreateStyled060Renderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.large.LargeCreateStyled080Renderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium10010TenderRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium202TrailingRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium404TrailingRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium606TenderRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium606TrailingRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.Medium808TenderRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.MediumQuadrupleWheelRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.MediumQuintupleWheelRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.MediumSingleWheelRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.MediumStandardRenderer; +import com.railwayteam.railways.content.custom_bogeys.renderer.standard.medium.MediumTripleWheelRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.standard.single_axle.CoilspringBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.standard.single_axle.LeafspringBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.standard.single_axle.SingleaxleBogeyRenderer; @@ -40,6 +56,9 @@ import com.railwayteam.railways.content.custom_bogeys.renderer.wide.WideComicallyLargeScotchYokeBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.wide.WideDefaultBogeyRenderer; import com.railwayteam.railways.content.custom_bogeys.renderer.wide.WideScotchYokeBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.special.invisible.InvisibleBogeyRenderer; +import com.railwayteam.railways.content.custom_bogeys.special.monobogey.InvisibleMonoBogeyBlock; +import com.railwayteam.railways.content.custom_bogeys.special.monobogey.MonoBogeyRenderer; import com.railwayteam.railways.impl.bogeymenu.v0.BogeyMenuManagerImpl; import com.railwayteam.railways.registry.CRTrackMaterials.CRTrackType; import com.railwayteam.railways.util.Utils; @@ -53,11 +72,16 @@ import com.simibubi.create.content.trains.track.TrackMaterial.TrackType; import com.simibubi.create.foundation.utility.Components; import com.simibubi.create.foundation.utility.Pair; -import dev.architectury.injectables.annotations.ExpectPlatform; import net.minecraft.network.chat.Component; import net.minecraft.resources.ResourceLocation; -import java.util.*; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; import static com.simibubi.create.AllBogeyStyles.STANDARD; import static com.simibubi.create.AllBogeyStyles.STANDARD_CYCLE_GROUP; @@ -418,12 +442,5 @@ public static void register() { addToCategory(ALL_TEST_CATEGORY, style); } } - - fireReadyForRegistrationEvent(); - } - - @ExpectPlatform - public static void fireReadyForRegistrationEvent() { - throw new AssertionError(); } } \ No newline at end of file diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRCommands.java b/common/src/main/java/com/railwayteam/railways/registry/CRCommands.java index 5e8218c8a..be18142aa 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRCommands.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRCommands.java @@ -21,7 +21,13 @@ import com.mojang.brigadier.CommandDispatcher; import com.mojang.brigadier.tree.CommandNode; import com.mojang.brigadier.tree.LiteralCommandNode; -import com.railwayteam.railways.registry.commands.*; +import com.railwayteam.railways.registry.commands.ConductorDemoCommand; +import com.railwayteam.railways.registry.commands.PalettesDemoCommand; +import com.railwayteam.railways.registry.commands.ReloadCasingCollisionCommand; +import com.railwayteam.railways.registry.commands.ReloadCreativeTabsCommand; +import com.railwayteam.railways.registry.commands.SplitTrainCommand; +import com.railwayteam.railways.registry.commands.TrackDemoCommand; +import com.railwayteam.railways.registry.commands.TrainInfoCommand; import com.railwayteam.railways.util.Utils; import com.simibubi.create.infrastructure.command.AllCommands; import net.minecraft.commands.CommandSourceStack; @@ -31,30 +37,30 @@ import static net.minecraft.commands.Commands.literal; public class CRCommands { - public static void register(CommandDispatcher dispatcher, boolean dedicated) { - - var railwaysCommand = literal("railways") - .requires(cs -> cs.hasPermission(0)) - //.then(ClearCasingCacheCommand.register()) - .then(SplitTrainCommand.register()) - .then(TrainInfoCommand.register()); - - if (Utils.isDevEnv()) { - railwaysCommand = railwaysCommand - .then(TrackDemoCommand.register()) - .then(ConductorDemoCommand.register()) - .then(ReloadCasingCollisionCommand.register()) - .then(ReloadCreativeTabsCommand.register()) - .then(PalettesDemoCommand.register()); - } + public static void register(CommandDispatcher dispatcher, boolean dedicated) { + + var railwaysCommand = literal("railways") + .requires(cs -> cs.hasPermission(0)) + //.then(ClearCasingCacheCommand.register()) + .then(SplitTrainCommand.register()) + .then(TrainInfoCommand.register()); - LiteralCommandNode railwaysRoot = dispatcher.register(railwaysCommand); + if (Utils.isDevEnv()) { + railwaysCommand = railwaysCommand + .then(TrackDemoCommand.register()) + .then(ConductorDemoCommand.register()) + .then(ReloadCasingCollisionCommand.register()) + .then(ReloadCreativeTabsCommand.register()) + .then(PalettesDemoCommand.register()); + } - CommandNode snr = dispatcher.findNode(Collections.singleton("snr")); - if (snr != null) - return; + LiteralCommandNode railwaysRoot = dispatcher.register(railwaysCommand); - dispatcher.getRoot() - .addChild(AllCommands.buildRedirect("snr", railwaysRoot)); - } + CommandNode snr = dispatcher.findNode(Collections.singleton("snr")); + if (snr != null) + return; + + dispatcher.getRoot() + .addChild(AllCommands.buildRedirect("snr", railwaysRoot)); + } } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRCommandsClient.java b/common/src/main/java/com/railwayteam/railways/registry/CRCommandsClient.java index 4e52fc8c4..d4ebf5c20 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRCommandsClient.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRCommandsClient.java @@ -33,49 +33,48 @@ import static com.railwayteam.railways.multiloader.ClientCommands.literal; public class CRCommandsClient { - public static void register(CommandDispatcher dispatcher) { - LiteralCommandNode railwaysRoot = dispatcher.register(literal("railways_client") - .requires(cs -> cs.hasPermission(0)) - .then(ClearCasingCacheCommand.register()) - .then(ClearCapCacheCommand.register()) - .then(ReloadJourneymapCommand.register()) - .then(ReloadDevCapesCommand.register()) - ); + public static void register(CommandDispatcher dispatcher) { + LiteralCommandNode railwaysRoot = dispatcher.register(literal("railways_client") + .requires(cs -> cs.hasPermission(0)) + .then(ClearCasingCacheCommand.register()) + .then(ClearCapCacheCommand.register()) + .then(ReloadJourneymapCommand.register()) + .then(ReloadDevCapesCommand.register()) + ); - CommandNode snrc = dispatcher.findNode(Collections.singleton("snrc")); - if (snrc != null) - return; + CommandNode snrc = dispatcher.findNode(Collections.singleton("snrc")); + if (snrc != null) + return; - dispatcher.getRoot() - .addChild(buildRedirect("snrc", railwaysRoot)); - } + dispatcher.getRoot() + .addChild(buildRedirect("snrc", railwaysRoot)); + } - /** - * Copied from AllCommands, with generics weakened. - * Original source: - * https://github.com/VelocityPowered/Velocity/blob/8abc9c80a69158ebae0121fda78b55c865c0abad/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java#L38 - * - *

- * Returns a literal node that redirects its execution to - * the given destination node. - * - * @param alias the command alias - * @param destination the destination node - * - * @return the built node - */ - public static LiteralCommandNode buildRedirect(final String alias, final LiteralCommandNode destination) { - // Redirects only work for nodes with children, but break the top argument-less command. - // Manually adding the root command after setting the redirect doesn't fix it. - // See https://github.com/Mojang/brigadier/issues/46). Manually clone the node instead. - LiteralArgumentBuilder builder = LiteralArgumentBuilder - .literal(alias) - .requires(destination.getRequirement()) - .forward(destination.getRedirect(), destination.getRedirectModifier(), destination.isFork()) - .executes(destination.getCommand()); - for (CommandNode child : destination.getChildren()) { - builder.then(child); - } - return builder.build(); - } + /** + * Copied from AllCommands, with generics weakened. + * Original source: + * https://github.com/VelocityPowered/Velocity/blob/8abc9c80a69158ebae0121fda78b55c865c0abad/proxy/src/main/java/com/velocitypowered/proxy/util/BrigadierUtils.java#L38 + * + *

+ * Returns a literal node that redirects its execution to + * the given destination node. + * + * @param alias the command alias + * @param destination the destination node + * @return the built node + */ + public static LiteralCommandNode buildRedirect(final String alias, final LiteralCommandNode destination) { + // Redirects only work for nodes with children, but break the top argument-less command. + // Manually adding the root command after setting the redirect doesn't fix it. + // See https://github.com/Mojang/brigadier/issues/46). Manually clone the node instead. + LiteralArgumentBuilder builder = LiteralArgumentBuilder + .literal(alias) + .requires(destination.getRequirement()) + .forward(destination.getRedirect(), destination.getRedirectModifier(), destination.isFork()) + .executes(destination.getCommand()); + for (CommandNode child : destination.getChildren()) { + builder.then(child); + } + return builder.build(); + } } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRContainerTypes.java b/common/src/main/java/com/railwayteam/railways/registry/CRContainerTypes.java index 9b84ad653..bcdeb29a3 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRContainerTypes.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRContainerTypes.java @@ -30,21 +30,22 @@ import net.minecraft.world.inventory.AbstractContainerMenu; public class CRContainerTypes { - private static final CreateRegistrate REGISTRATE = Railways.registrate(); + private static final CreateRegistrate REGISTRATE = Railways.registrate(); - public static final MenuEntry MOUNTED_TOOLBOX = register( - "mounted_toolbox", - MountedToolboxContainer::new, - () -> MountedToolboxScreen::create - ); + public static final MenuEntry MOUNTED_TOOLBOX = register( + "mounted_toolbox", + MountedToolboxContainer::new, + () -> MountedToolboxScreen::create + ); - private static > MenuEntry register( - String name, MenuBuilder.ForgeMenuFactory factory, NonNullSupplier> screenFactory) { - return REGISTRATE - .menu(name, factory, screenFactory) - .register(); - } + private static > MenuEntry register( + String name, MenuBuilder.ForgeMenuFactory factory, NonNullSupplier> screenFactory) { + return REGISTRATE + .menu(name, factory, screenFactory) + .register(); + } - @SuppressWarnings("EmptyMethod") - public static void register() {} + @SuppressWarnings("EmptyMethod") + public static void register() { + } } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRCreativeModeTabs.java b/common/src/main/java/com/railwayteam/railways/registry/CRCreativeModeTabs.java index 82c5ea9b8..e3c0fff77 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRCreativeModeTabs.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRCreativeModeTabs.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.registry; import com.railwayteam.railways.Railways; diff --git a/common/src/main/java/com/railwayteam/railways/registry/CREntities.java b/common/src/main/java/com/railwayteam/railways/registry/CREntities.java index ed8340814..2d20e01af 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CREntities.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CREntities.java @@ -46,42 +46,44 @@ import java.util.function.Consumer; public class CREntities { - private static final CreateRegistrate REGISTRATE = Railways.registrate(); + private static final CreateRegistrate REGISTRATE = Railways.registrate(); - public static final EntityEntry CART_BLOCK = REGISTRATE.entity("benchcart", MinecartWorkbench::new, MobCategory.MISC) - .renderer(() -> CREntities::cartRenderer) - .properties(configure(c -> c.size(0.98F, 0.7F))) - .lang("Minecart with Workbench") - .register(); - public static final EntityEntry CART_JUKEBOX = REGISTRATE.entity("jukeboxcart", MinecartJukebox::new, MobCategory.MISC) - .renderer(() -> CREntities::cartRenderer) - .properties(configure(c -> c.size(0.98F, 0.7F))) - .lang("Minecart with Jukebox") - .register(); + public static final EntityEntry CART_BLOCK = REGISTRATE.entity("benchcart", MinecartWorkbench::new, MobCategory.MISC) + .renderer(() -> CREntities::cartRenderer) + .properties(configure(c -> c.size(0.98F, 0.7F))) + .lang("Minecart with Workbench") + .register(); - public static final EntityEntry CONDUCTOR = REGISTRATE.entity("conductor", ConductorEntity::new, MobCategory.CREATURE) - .renderer(()-> ConductorRenderer::new) - .lang("Conductor") - .properties(configure(c -> c.size(0.6f, 1.5f).fireImmune())) - .loot((table, type)-> table.add(type, new LootTable.Builder().withPool( - LootPool.lootPool() - .setRolls(ConstantValue.exactly(1.0f)) - .add(LootItem.lootTableItem(AllItems.ANDESITE_ALLOY.get()) - .apply(SetItemCountFunction.setCount(UniformGenerator.between(0.0f, 1.0f))) - ) - ))) - .attributes(ConductorEntity::createAttributes) - .register(); + public static final EntityEntry CART_JUKEBOX = REGISTRATE.entity("jukeboxcart", MinecartJukebox::new, MobCategory.MISC) + .renderer(() -> CREntities::cartRenderer) + .properties(configure(c -> c.size(0.98F, 0.7F))) + .lang("Minecart with Jukebox") + .register(); - private static NonNullConsumer configure(Consumer consumer) { - return builder -> consumer.accept(EntityTypeConfigurator.of(builder)); - } + public static final EntityEntry CONDUCTOR = REGISTRATE.entity("conductor", ConductorEntity::new, MobCategory.CREATURE) + .renderer(() -> ConductorRenderer::new) + .lang("Conductor") + .properties(configure(c -> c.size(0.6f, 1.5f).fireImmune())) + .loot((table, type) -> table.add(type, new LootTable.Builder().withPool( + LootPool.lootPool() + .setRolls(ConstantValue.exactly(1.0f)) + .add(LootItem.lootTableItem(AllItems.ANDESITE_ALLOY.get()) + .apply(SetItemCountFunction.setCount(UniformGenerator.between(0.0f, 1.0f))) + ) + ))) + .attributes(ConductorEntity::createAttributes) + .register(); - @Environment(EnvType.CLIENT) - private static EntityRenderer cartRenderer(Context ctx) { - return new MinecartRenderer<>(ctx, ModelLayers.MINECART); - } + private static NonNullConsumer configure(Consumer consumer) { + return builder -> consumer.accept(EntityTypeConfigurator.of(builder)); + } - @SuppressWarnings("EmptyMethod") - public static void register() {} + @Environment(EnvType.CLIENT) + private static EntityRenderer cartRenderer(Context ctx) { + return new MinecartRenderer<>(ctx, ModelLayers.MINECART); + } + + @SuppressWarnings("EmptyMethod") + public static void register() { + } } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRParticleTypes.java b/common/src/main/java/com/railwayteam/railways/registry/CRParticleTypes.java index 8fd08a1fb..6bc98783f 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRParticleTypes.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRParticleTypes.java @@ -34,7 +34,6 @@ import java.util.function.Supplier; public enum CRParticleTypes { - SMOKE(SmokeParticleData::new), SMOKE_PUFF_SMALL(PuffSmokeParticleData.Small::new), SMOKE_PUFF_MEDIUM(PuffSmokeParticleData.Medium::new), @@ -96,5 +95,4 @@ private static void registerFactory(ParticleType throw new AssertionError(); } } - } diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRPonderIndex.java b/common/src/main/java/com/railwayteam/railways/registry/CRPonderIndex.java index 3d0e0701a..4f6440b1b 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRPonderIndex.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRPonderIndex.java @@ -27,7 +27,8 @@ public class CRPonderIndex { - static final PonderRegistrationHelper HELPER = new PonderRegistrationHelper(Railways.MODID); + private static final PonderRegistrationHelper HELPER = new PonderRegistrationHelper(Railways.MODID); + public static void register() { HELPER.forComponents(CRBlocks.SEMAPHORE) .addStoryBoard("semaphore", TrainScenes::signaling); diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRSchedule.java b/common/src/main/java/com/railwayteam/railways/registry/CRSchedule.java index 26ebf215e..ffa95d66f 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRSchedule.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRSchedule.java @@ -32,7 +32,6 @@ import static com.simibubi.create.content.trains.schedule.Schedule.INSTRUCTION_TYPES; public class CRSchedule { - static { registerInstruction("redstone_link", RedstoneLinkInstruction::new); registerInstruction("waypoint_destination", WaypointDestinationInstruction::new); diff --git a/common/src/main/java/com/railwayteam/railways/registry/CRTags.java b/common/src/main/java/com/railwayteam/railways/registry/CRTags.java index 36f42d333..0186f9514 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/CRTags.java +++ b/common/src/main/java/com/railwayteam/railways/registry/CRTags.java @@ -38,9 +38,7 @@ public class CRTags { public enum NameSpace { - MOD(Railways.MODID, false, true), - FORGE("forge"); - + MOD(Railways.MODID, false, true); public final String id; public final boolean optionalDefault; diff --git a/common/src/main/java/com/railwayteam/railways/registry/commands/ReloadCreativeTabsCommand.java b/common/src/main/java/com/railwayteam/railways/registry/commands/ReloadCreativeTabsCommand.java index 0a337e47a..eb84ca8ae 100644 --- a/common/src/main/java/com/railwayteam/railways/registry/commands/ReloadCreativeTabsCommand.java +++ b/common/src/main/java/com/railwayteam/railways/registry/commands/ReloadCreativeTabsCommand.java @@ -1,4 +1,22 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.registry.commands; import com.mojang.brigadier.builder.ArgumentBuilder; diff --git a/common/src/main/java/com/railwayteam/railways/util/MathUtils.java b/common/src/main/java/com/railwayteam/railways/util/MathUtils.java index 13ff468db..d059de05b 100644 --- a/common/src/main/java/com/railwayteam/railways/util/MathUtils.java +++ b/common/src/main/java/com/railwayteam/railways/util/MathUtils.java @@ -1,3 +1,21 @@ +/* + * Steam 'n' Rails + * Copyright (c) 2024 The Railways Team + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program. If not, see . + */ + package com.railwayteam.railways.util; import org.joml.Matrix4f; diff --git a/common/src/main/resources/railways-common.mixins.json b/common/src/main/resources/railways-common.mixins.json index cb8c0af1f..458f4b318 100644 --- a/common/src/main/resources/railways-common.mixins.json +++ b/common/src/main/resources/railways-common.mixins.json @@ -13,7 +13,7 @@ "AccessorCarriageContraption", "AccessorCarriageContraptionEntity", "AccessorCreativeModeTabs", - "AccessorIngredient_TagValue", + "AccessorIngredient$TagValue", "AccessorMountedFluidStorage", "AccessorNavigation", "AccessorOrientedContraptionEntity", diff --git a/fabric/src/main/java/com/railwayteam/railways/registry/fabric/CRBogeyStylesImpl.java b/fabric/src/main/java/com/railwayteam/railways/registry/fabric/CRBogeyStylesImpl.java deleted file mode 100644 index b6187b6c5..000000000 --- a/fabric/src/main/java/com/railwayteam/railways/registry/fabric/CRBogeyStylesImpl.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Steam 'n' Rails - * Copyright (c) 2022-2024 The Railways Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.railwayteam.railways.registry.fabric; - -import com.railwayteam.railways.api.bogeymenu.v0.fabric.BogeyMenuEvents; - -public class CRBogeyStylesImpl { - public static void fireReadyForRegistrationEvent() { - BogeyMenuEvents.ENTRY_REGISTRATION.invoker().onReadyForRegistration(); - } -} diff --git a/forge/src/main/java/com/railwayteam/railways/registry/forge/CRBogeyStylesImpl.java b/forge/src/main/java/com/railwayteam/railways/registry/forge/CRBogeyStylesImpl.java deleted file mode 100644 index e4cb1d024..000000000 --- a/forge/src/main/java/com/railwayteam/railways/registry/forge/CRBogeyStylesImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * Steam 'n' Rails - * Copyright (c) 2022-2024 The Railways Team - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with this program. If not, see . - */ - -package com.railwayteam.railways.registry.forge; - -import com.railwayteam.railways.api.bogeymenu.v0.forge.BogeyMenuEvents; -import net.minecraftforge.common.MinecraftForge; - -public class CRBogeyStylesImpl { - public static void fireReadyForRegistrationEvent() { - MinecraftForge.EVENT_BUS.post(new BogeyMenuEvents.EntryRegistrationEvent()); - } -}