Skip to content

Commit f37b9df

Browse files
committed
Bug fixes
1 parent 74c0dc0 commit f37b9df

17 files changed

Lines changed: 7 additions & 25 deletions

.github/workflows/publish.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ jobs:
1818
- name: Grant execute permission for gradlew
1919
run: chmod +x gradlew
2020
- name: Build with Gradle
21-
run: ./gradlew generateChangelog build uploadSubProjects curseforge github publishToModrinth --stacktrace
21+
run: ./gradlew generateChangelog build curseforge github publishToModrinth --stacktrace
2222
env:
23-
BINTRAY_USER: oroarmor
24-
BINTRAY_KEY: ${{ secrets.BINTRAY_KEY }}
2523
CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
2624
MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
2725
DISCORD_ANNOUNCEMENT_WEBHOOK: ${{ secrets.DISCORD_ANNOUNCEMENT_WEBHOOK }}

common/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ dependencies {
2121
exclude(module: "fabric-loader")
2222
}
2323

24-
modCompile('com.oroarmor:multi-item-lib:1.2.0') {
24+
modCompile('com.oroarmor:multi-item-lib:1.3.0') {
2525
exclude(module: "fabric-api")
2626
exclude(module: "fabric-loader")
2727
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@ public static DyeColor getColor(Block block) {
134134
return block instanceof NetheriteShulkerBoxBlock ? ((NetheriteShulkerBoxBlock) block).getColor() : null;
135135
}
136136

137-
@Environment(EnvType.CLIENT)
138137
public static DyeColor getColor(Item item) {
139138
return getColor(Block.getBlockFromItem(item));
140139
}
@@ -149,7 +148,6 @@ protected void appendProperties(StateManager.Builder<Block, BlockState> builder)
149148
}
150149

151150
@Override
152-
@Environment(EnvType.CLIENT)
153151
public void appendTooltip(ItemStack stack, BlockView world, List<Text> tooltip, TooltipContext options) {
154152
super.appendTooltip(stack, world, tooltip, options);
155153
CompoundTag compoundTag = stack.getSubTag("BlockEntityTag");
@@ -223,7 +221,6 @@ public VoxelShape getOutlineShape(BlockState state, BlockView world, BlockPos po
223221
}
224222

225223
@Override
226-
@Environment(EnvType.CLIENT)
227224
public ItemStack getPickStack(BlockView world, BlockPos pos, BlockState state) {
228225
ItemStack itemStack = super.getPickStack(world, pos, state);
229226
NetheriteShulkerBoxBlockEntity shulkerBoxBlockEntity = (NetheriteShulkerBoxBlockEntity) world.getBlockEntity(pos);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -335,7 +335,6 @@ public void playSound(SoundEvent soundEvent) {
335335
world.playSound(null, pos, soundEvent, SoundCategory.BLOCKS, 1.0F, 1.0F);
336336
}
337337

338-
@Environment(EnvType.CLIENT)
339338
public List<NetheriteBeaconBlockEntity.BeamSegment> getBeamSegments() {
340339
return beaconLevel == 0 ? ImmutableList.of() : beamSegments;
341340
}
@@ -419,12 +418,10 @@ protected void increaseHeight() {
419418
++height;
420419
}
421420

422-
@Environment(EnvType.CLIENT)
423421
public float[] getColor() {
424422
return color;
425423
}
426424

427-
@Environment(EnvType.CLIENT)
428425
public int getHeight() {
429426
return height;
430427
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,6 @@ private Box getCollisionBox(Direction facing) {
140140
return this.getBoundingBox(facing).shrink(direction.getOffsetX(), direction.getOffsetY(), direction.getOffsetZ());
141141
}
142142

143-
@Environment(EnvType.CLIENT)
144143
public DyeColor getColor() {
145144
if (cachedColorUpdateNeeded) {
146145
cachedColor = NetheriteShulkerBoxBlock.getColor(getCachedState().getBlock());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public NetheriteFishingBobberEntity(PlayerEntity thrower, World world, int lureL
6565
super(thrower, world, lureLevel, luckOfTheSeaLevel);
6666
}
6767

68-
@Environment(EnvType.CLIENT)
6968
public NetheriteFishingBobberEntity(World world, PlayerEntity thrower, double x, double y, double z) {
7069
super(world, thrower, x, y, z);
7170
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ public NetheriteTridentEntity(EntityType<? extends TridentEntity> entityType, Wo
5454
tridentStack = new ItemStack(NetheritePlusItems.NETHERITE_TRIDENT.get());
5555
}
5656

57-
@Environment(EnvType.CLIENT)
5857
public NetheriteTridentEntity(World world, double x, double y, double z) {
5958
super(world, x, y, z);
6059
tridentStack = new ItemStack(NetheritePlusItems.NETHERITE_TRIDENT.get());

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ public float getKnockbackResistance() {
8686
}
8787

8888
@Override
89-
@Environment(EnvType.CLIENT)
9089
public String getName() {
9190
return name;
9291
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ public NetheriteHorseArmorItem(int bonus, Settings settings) {
3838
}
3939

4040
@Override
41-
@Environment(EnvType.CLIENT)
4241
public Identifier getEntityTexture() {
4342
return id("textures/entity/netherite_horse_armor.png");
4443
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ public class UpdateNetheriteBeaconC2SPacket extends UpdateBeaconC2SPacket {
4040

4141
private int tertiaryEffectId;
4242

43-
@Environment(EnvType.CLIENT)
4443
public UpdateNetheriteBeaconC2SPacket(int primaryEffectId, int secondaryEffectId, int tertiaryEffectId) {
4544
super(primaryEffectId, secondaryEffectId);
4645
this.tertiaryEffectId = tertiaryEffectId;

0 commit comments

Comments
 (0)