Bug fixes

.github/workflows/publish.yml

@@ -18,10 +18,8 @@ jobs:
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
     - name: Build with Gradle
-      run:  ./gradlew generateChangelog build uploadSubProjects curseforge github publishToModrinth --stacktrace
+      run:  ./gradlew generateChangelog build curseforge github publishToModrinth --stacktrace
       env:
-          BINTRAY_USER: oroarmor
-          BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
           CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
           MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
           DISCORD_ANNOUNCEMENT_WEBHOOK: ${{ secrets.DISCORD_ANNOUNCEMENT_WEBHOOK }}

common/build.gradle

@@ -21,7 +21,7 @@ dependencies {
         exclude(module: "fabric-loader")
     }
 
-    modCompile('com.oroarmor:multi-item-lib:1.2.0') {
+    modCompile('com.oroarmor:multi-item-lib:1.3.0') {
         exclude(module: "fabric-api")
         exclude(module: "fabric-loader")
     }

common/src/main/java/com/oroarmor/netherite_plus/block/NetheriteShulkerBoxBlock.java

@@ -134,7 +134,6 @@ public static DyeColor getColor(Block block) {
         return block instanceof NetheriteShulkerBoxBlock ? ((NetheriteShulkerBoxBlock) block).getColor() : null;
     }
 
-    @Environment(EnvType.CLIENT)
     public static DyeColor getColor(Item item) {
         return getColor(Block.getBlockFromItem(item));
     }
@@ -149,7 +148,6 @@ protected void appendProperties(StateManager.Builder<Block, BlockState> builder)
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public void appendTooltip(ItemStack stack, BlockView world, List<Text> tooltip, TooltipContext options) {
         super.appendTooltip(stack, world, tooltip, options);
         CompoundTag compoundTag = stack.getSubTag("BlockEntityTag");
@@ -223,7 +221,6 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
         ItemStack itemStack = super.getPickStack(world, pos, state);
         NetheriteShulkerBoxBlockEntity shulkerBoxBlockEntity = (NetheriteShulkerBoxBlockEntity) world.getBlockEntity(pos);

common/src/main/java/com/oroarmor/netherite_plus/block/entity/NetheriteBeaconBlockEntity.java

@@ -335,7 +335,6 @@ public void playSound(SoundEvent soundEvent) {
         world.playSound(null, pos, soundEvent, SoundCategory.BLOCKS, 1.0F, 1.0F);
     }
 
-    @Environment(EnvType.CLIENT)
     public List<NetheriteBeaconBlockEntity.BeamSegment> getBeamSegments() {
         return beaconLevel == 0 ? ImmutableList.of() : beamSegments;
     }
@@ -419,12 +418,10 @@ protected void increaseHeight() {
             ++height;
         }
 
-        @Environment(EnvType.CLIENT)
         public float[] getColor() {
             return color;
         }
 
-        @Environment(EnvType.CLIENT)
         public int getHeight() {
             return height;
         }

common/src/main/java/com/oroarmor/netherite_plus/block/entity/NetheriteShulkerBoxBlockEntity.java

@@ -140,7 +140,6 @@ private Box getCollisionBox(Direction facing) {
         return this.getBoundingBox(facing).shrink(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ());
     }
 
-    @Environment(EnvType.CLIENT)
     public DyeColor getColor() {
         if (cachedColorUpdateNeeded) {
             cachedColor = NetheriteShulkerBoxBlock.getColor(getCachedState().getBlock());

common/src/main/java/com/oroarmor/netherite_plus/entity/NetheriteFishingBobberEntity.java

@@ -65,7 +65,6 @@ public NetheriteFishingBobberEntity(PlayerEntity thrower, World world, int lureL
         super(thrower, world, lureLevel, luckOfTheSeaLevel);
     }
 
-    @Environment(EnvType.CLIENT)
     public NetheriteFishingBobberEntity(World world, PlayerEntity thrower, double x, double y, double z) {
         super(world, thrower, x, y, z);
     }

common/src/main/java/com/oroarmor/netherite_plus/entity/NetheriteTridentEntity.java

@@ -54,7 +54,6 @@ public NetheriteTridentEntity(EntityType<? extends TridentEntity> entityType, Wo
         tridentStack = new ItemStack(NetheritePlusItems.NETHERITE_TRIDENT.get());
     }
 
-    @Environment(EnvType.CLIENT)
     public NetheriteTridentEntity(World world, double x, double y, double z) {
         super(world, x, y, z);
         tridentStack = new ItemStack(NetheritePlusItems.NETHERITE_TRIDENT.get());

common/src/main/java/com/oroarmor/netherite_plus/item/NetheriteElytraArmorMaterials.java

@@ -86,7 +86,6 @@ public float getKnockbackResistance() {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public String getName() {
         return name;
     }

common/src/main/java/com/oroarmor/netherite_plus/item/NetheriteHorseArmorItem.java

@@ -38,7 +38,6 @@ public NetheriteHorseArmorItem(int bonus, Settings settings) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public Identifier getEntityTexture() {
         return id("textures/entity/netherite_horse_armor.png");
     }

common/src/main/java/com/oroarmor/netherite_plus/network/UpdateNetheriteBeaconC2SPacket.java

@@ -40,7 +40,6 @@ public class UpdateNetheriteBeaconC2SPacket extends UpdateBeaconC2SPacket {
 
     private int tertiaryEffectId;
 
-    @Environment(EnvType.CLIENT)
     public UpdateNetheriteBeaconC2SPacket(int primaryEffectId, int secondaryEffectId, int tertiaryEffectId) {
         super(primaryEffectId, secondaryEffectId);
         this.tertiaryEffectId = tertiaryEffectId;

common/src/main/java/com/oroarmor/netherite_plus/recipe/NetheriteShieldDecorationRecipe.java

@@ -70,7 +70,6 @@ public ItemStack craft(CraftingInventory craftingInventory) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public boolean fits(int width, int height) {
         return width * height >= 2;
     }

common/src/main/java/com/oroarmor/netherite_plus/recipe/NetheriteShulkerBoxColoringRecipe.java

@@ -71,7 +71,6 @@ public ItemStack craft(CraftingInventory craftingInventory) {
     }
 
     @Override
-    @Environment(EnvType.CLIENT)
     public boolean fits(int width, int height) {
         return width * height >= 2;
     }

common/src/main/java/com/oroarmor/netherite_plus/screen/NetheriteAnvilScreenHandler.java

@@ -76,7 +76,6 @@ protected boolean canUse(BlockState state) {
         return state.isOf(NetheritePlusBlocks.NETHERITE_ANVIL_BLOCK.get());
     }
 
-    @Environment(EnvType.CLIENT)
     public int getLevelCost() {
         return levelCost.get();
     }

common/src/main/java/com/oroarmor/netherite_plus/screen/NetheritePlusScreenHandlers.java

@@ -57,7 +57,6 @@ public static <T extends ScreenHandler> ScreenHandlerType<T> register(Identifier
     public static void init() {
     }
 
-    @Environment(EnvType.CLIENT)
     public static void initializeClient() {
         MenuRegistry.registerScreenFactory(NetheritePlusScreenHandlers.NETHERITE_ANVIL, NetheriteAnvilScreen::new);
         MenuRegistry.registerScreenFactory(NetheritePlusScreenHandlers.NETHERITE_BEACON, NetheriteBeaconScreen::new);

fabric/build.gradle

@@ -115,7 +115,7 @@ dependencies {
 
     //Libraries
     includeLibraries(['com.oroarmor:oro-config-fabric:3.0.0',
-                      'com.oroarmor:multi-item-lib:1.2.0'])
+                      'com.oroarmor:multi-item-lib:1.3.0'])
 
     runAndCompile([/*"net.kyrptonaught:quickshulker:${project.quickshulker}",*/
                    "com.github.emilyploszaj:trinkets:${project.trinkets}",

forge/build.gradle

@@ -37,8 +37,8 @@ dependencies {
         exclude(module: "fabric-loader")
     }
 
-    modImplementation('com.oroarmor:oro-config-forge:3.0.0')
-    modRuntime('com.oroarmor:oro-config-forge:3.0.0')
+    shadow(modImplementation('com.oroarmor:oro-config-forge:3.1.0'))
+    modRuntime('com.oroarmor:oro-config-forge:3.1.0')
 
     implementation(project(path: ":common")) {
         exclude(module: "fabric-loader")

gradle.properties

@@ -5,13 +5,13 @@ org.gradle.jvmargs=-Xmx2G
 minecraft_version=1.16.5
 fabric_loader_version=0.11.3
 # Mod Properties
-mod_version=1.4.3
+mod_version=1.4.4
 maven_group=com.oroarmor
 archives_base_name=netherite-plus-mod
 project_name=Netherite Plus Mod
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
 fabric_version=0.34.0+1.16
-forge_version=36.1.0
+forge_version=36.1.16
 architectury_version=1.9.136
 mappings=1.16.5+build.8