Skip to content

Commit

Permalink
Bump version, formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
ACGaming committed Apr 5, 2024
1 parent 9958925 commit 96616e1
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ org.gradle.jvmargs = -Xmx3G
maven_group = mod.acgaming
mod_id = universaltweaks
mod_name = Universal Tweaks
mod_version = 1.10.1
mod_version = 1.11.0
archives_base_name = UniversalTweaks-1.12.2

# If any properties changes below this line, run `gradlew setupDecompWorkspace` and refresh gradle again to ensure everything is working correctly.
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
package mod.acgaming.universaltweaks.mods.abyssalcraft.mixin;

import net.minecraftforge.event.entity.living.LivingDeathEvent;

import com.shinoow.abyssalcraft.common.handlers.PlagueEventHandler;
import mod.acgaming.universaltweaks.config.UTConfigMods;
import net.minecraftforge.event.entity.living.LivingDeathEvent;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
package mod.acgaming.universaltweaks.mods.actuallyadditions.mixin;

import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import mod.acgaming.universaltweaks.config.UTConfigMods;
import net.minecraft.block.state.IBlockState;
import net.minecraft.entity.player.EntityPlayer;
import net.minecraft.item.ItemStack;
Expand All @@ -12,6 +8,11 @@
import net.minecraft.util.EnumHand;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.World;

import de.ellpeck.actuallyadditions.mod.blocks.BlockLaserRelay;
import de.ellpeck.actuallyadditions.mod.tile.TileEntityLaserRelay;
import de.ellpeck.actuallyadditions.mod.util.StackUtil;
import mod.acgaming.universaltweaks.config.UTConfigMods;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
import org.spongepowered.asm.mixin.injection.Inject;
Expand All @@ -26,12 +27,14 @@ public void utOnBlockActivated(World world, BlockPos pos, IBlockState state, Ent
{
if (!UTConfigMods.ACTUALLY_ADDITIONS.utLaserUpgradeVoid) return;
TileEntity tile = world.getTileEntity(pos);
if (tile instanceof TileEntityLaserRelay) {
if (tile instanceof TileEntityLaserRelay)
{
ItemStack stack = player.getHeldItem(hand);
ItemStack set = stack.copy();
set.setCount(1);
((TileEntityLaserRelay) tile).inv.setStackInSlot(0, set);
if (!player.isCreative()) {
if (!player.isCreative())
{
player.setHeldItem(hand, StackUtil.shrink(stack, 1));
}
cir.setReturnValue(true);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package mod.acgaming.universaltweaks.mods.tconstruct.mixin;

import javax.annotation.Nonnull;

import mod.acgaming.universaltweaks.config.UTConfigMods;
import org.spongepowered.asm.mixin.Mixin;
import org.spongepowered.asm.mixin.injection.At;
Expand All @@ -9,8 +11,6 @@
import slimeknights.tconstruct.smeltery.client.SmelteryTankRenderer;
import slimeknights.tconstruct.smeltery.tileentity.TileSmeltery;

import javax.annotation.Nonnull;

// Courtesy of WaitingIdly
@Mixin(value = SmelteryRenderer.class, remap = false)
public abstract class SmelteryRendererMixin extends SmelteryTankRenderer<TileSmeltery>
Expand All @@ -19,7 +19,8 @@ public abstract class SmelteryRendererMixin extends SmelteryTankRenderer<TileSme
public void utRender(@Nonnull TileSmeltery smeltery, double x, double y, double z, float partialTicks, int destroyStage, float alpha, CallbackInfo ci)
{
if (UTConfigMods.TINKERS_CONSTRUCT.utMaximumItemRendersInSmeltery == -1) return;
if (smeltery.getSizeInventory() > UTConfigMods.TINKERS_CONSTRUCT.utMaximumItemRendersInSmeltery) {
if (smeltery.getSizeInventory() > UTConfigMods.TINKERS_CONSTRUCT.utMaximumItemRendersInSmeltery)
{
ci.cancel();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/mixins.mods.tconstruct.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
"refmap": "universaltweaks.refmap.json",
"minVersion": "0.8",
"compatibilityLevel": "JAVA_8",
"mixins": ["MaterialAccessor", "UTEntityProjectileBaseMixin", "UTFaucetMixin", "UTLongSwordMixin", "UTRapierMixin", "SmelteryRendererMixin"]
"mixins": ["MaterialAccessor", "SmelteryRendererMixin", "UTEntityProjectileBaseMixin", "UTFaucetMixin", "UTLongSwordMixin", "UTRapierMixin"]
}

0 comments on commit 96616e1

Please sign in to comment.