Skip to content

Commit 802b4ab

Browse files
JohnButlerThirdJohnButlerThird
committed
Rename some packages
1 parent b712f2a commit 802b4ab

36 files changed

Lines changed: 231 additions & 235 deletions

‎src/main/java/net/pufferlab/primal/Utils.java‎

Lines changed: 0 additions & 97 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,15 @@
33
import java.util.*;
44

55
import net.minecraft.block.Block;
6-
import net.minecraft.entity.player.EntityPlayer;
7-
import net.minecraft.entity.player.InventoryPlayer;
86
import net.minecraft.item.*;
97
import net.minecraft.launchwrapper.Launch;
108
import net.minecraft.nbt.NBTTagCompound;
11-
import net.minecraft.stats.StatList;
129
import net.minecraft.util.StatCollector;
1310
import net.minecraft.world.World;
1411
import net.minecraft.world.biome.BiomeGenBase;
1512
import net.minecraftforge.common.BiomeDictionary;
16-
import net.minecraftforge.common.MinecraftForge;
17-
import net.minecraftforge.common.util.ForgeDirection;
18-
import net.minecraftforge.event.entity.player.PlayerDestroyItemEvent;
1913
import net.minecraftforge.fluids.*;
2014
import net.minecraftforge.oredict.OreDictionary;
21-
import net.pufferlab.primal.blocks.BlockContainerPrimal;
2215
import net.pufferlab.primal.utils.*;
2316
import net.pufferlab.primal.world.GlobalTickingData;
2417

@@ -49,28 +42,6 @@ public static boolean isClose(double number, double number2) {
4942
return false;
5043
}
5144

52-
public static void damageItemIndex(int index, int amount, InventoryPlayer invPlayer) {
53-
if (!(invPlayer.player.capabilities.isCreativeMode)) {
54-
ItemStack stack = invPlayer.getStackInSlot(index);
55-
if (stack.isItemStackDamageable()) {
56-
if (stack.attemptDamageItem(amount, invPlayer.player.getRNG())) {
57-
invPlayer.player.renderBrokenItemStack(stack);
58-
--stack.stackSize;
59-
60-
if (invPlayer.player != null) {
61-
EntityPlayer entityplayer = (EntityPlayer) invPlayer.player;
62-
entityplayer.addStat(StatList.objectBreakStats[Item.getIdFromItem(stack.getItem())], 1);
63-
}
64-
if (stack.stackSize <= 0) {
65-
invPlayer.setInventorySlotContents(index, (ItemStack) null);
66-
MinecraftForge.EVENT_BUS.post(new PlayerDestroyItemEvent(invPlayer.player, stack));
67-
}
68-
}
69-
70-
}
71-
}
72-
}
73-
7445
public static NBTTagCompound getOrCreateTagCompound(ItemStack item) {
7546
NBTTagCompound tag = item.getTagCompound();
7647
if (tag == null) {
@@ -150,74 +121,6 @@ public static boolean equalsStack(ItemStack check, FluidStack wild) {
150121
return wild.getFluid() == stack.getFluid();
151122
}
152123

153-
public static void place(ItemStack stack, World world, int x, int y, int z, Block toPlace, int metadata,
154-
EntityPlayer player) {
155-
if (world.isAirBlock(x, y, z) && world.isSideSolid(x, y - 1, z, ForgeDirection.UP)) {
156-
if (world.checkNoEntityCollision(toPlace.getCollisionBoundingBoxFromPool(world, x, y, z))
157-
&& world.setBlock(x, y, z, toPlace, metadata, 3)) {
158-
world.setBlock(x, y, z, toPlace, metadata, 2);
159-
toPlace.onBlockPlacedBy(world, x, y, z, player, stack);
160-
if (toPlace instanceof BlockContainerPrimal block2) {
161-
block2.onBlockSidePlacedBy(world, x, y, z, player, stack, 0);
162-
}
163-
stack.stackSize -= 1;
164-
playSound(world, x, y, z, toPlace);
165-
player.swingItem();
166-
}
167-
}
168-
}
169-
170-
public static void placeNoConsume(ItemStack stack, World world, int x, int y, int z, Block toPlace, int metadata,
171-
EntityPlayer player) {
172-
if (world.isAirBlock(x, y, z) && world.isSideSolid(x, y - 1, z, ForgeDirection.UP)) {
173-
if (world.checkNoEntityCollision(toPlace.getCollisionBoundingBoxFromPool(world, x, y, z))
174-
&& world.setBlock(x, y, z, toPlace, metadata, 3)) {
175-
world.setBlock(x, y, z, toPlace, metadata, 2);
176-
toPlace.onBlockPlacedBy(world, x, y, z, player, stack);
177-
if (toPlace instanceof BlockContainerPrimal block2) {
178-
block2.onBlockSidePlacedBy(world, x, y, z, player, stack, 0);
179-
}
180-
playSound(world, x, y, z, toPlace);
181-
player.swingItem();
182-
}
183-
}
184-
}
185-
186-
public static void placeSilent(ItemStack stack, World world, int x, int y, int z, Block toPlace, int metadata,
187-
EntityPlayer player) {
188-
if (world.isAirBlock(x, y, z) && world.isSideSolid(x, y - 1, z, ForgeDirection.UP)) {
189-
if (world.checkNoEntityCollision(toPlace.getCollisionBoundingBoxFromPool(world, x, y, z))
190-
&& world.setBlock(x, y, z, toPlace, metadata, 3)) {
191-
world.setBlock(x, y, z, toPlace, metadata, 2);
192-
toPlace.onBlockPlacedBy(world, x, y, z, player, stack);
193-
if (toPlace instanceof BlockContainerPrimal block2) {
194-
block2.onBlockSidePlacedBy(world, x, y, z, player, stack, 0);
195-
}
196-
player.swingItem();
197-
}
198-
}
199-
}
200-
201-
public static void playSound(World world, int x, int y, int z, Block block) {
202-
world.playSoundEffect(
203-
x + 0.5f,
204-
y + 0.5f,
205-
z + 0.5f,
206-
block.stepSound.func_150496_b(),
207-
(block.stepSound.getVolume() + 1.0F) / 2.0F,
208-
block.stepSound.getPitch() * 0.8F);
209-
}
210-
211-
public static void playSound(World world, int x, int y, int z, SoundTypePrimal stepSound) {
212-
world.playSoundEffect(
213-
x + 0.5f,
214-
y + 0.5f,
215-
z + 0.5f,
216-
stepSound.getPath(),
217-
(stepSound.getVolume() + 1.0F) / 2.0F,
218-
stepSound.getPitch() * 0.8F);
219-
}
220-
221124
public static boolean contains(int[] array, int targetString) {
222125
if (array == null) return false;
223126
for (int element : array) {

‎src/main/java/net/pufferlab/primal/blocks/BlockAxle.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
import net.pufferlab.primal.Primal;
1515
import net.pufferlab.primal.items.itemblocks.ItemBlockAxle;
1616
import net.pufferlab.primal.tileentities.TileEntityAxle;
17-
import net.pufferlab.primal.utils.FacingUtils;
17+
import net.pufferlab.primal.utils.BlockUtils;
1818

1919
public class BlockAxle extends BlockMotion {
2020

@@ -37,7 +37,7 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
3737
if (heldItem == null) return false;
3838
if (heldItem.getItem() == Item.getItemFromBlock(this) && heldItem.getItemDamage() == 1) {
3939
int axis = tef.axisMeta;
40-
int axisClicked = FacingUtils.getAxis(side);
40+
int axisClicked = BlockUtils.getAxis(side);
4141
if (axis == axisClicked) {
4242
tef.setGear(side, player);
4343
return true;

‎src/main/java/net/pufferlab/primal/blocks/BlockBarrel.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
import net.pufferlab.primal.Primal;
1919
import net.pufferlab.primal.recipes.BarrelRecipe;
2020
import net.pufferlab.primal.tileentities.TileEntityBarrel;
21-
import net.pufferlab.primal.utils.FacingUtils;
21+
import net.pufferlab.primal.utils.BlockUtils;
2222

2323
public class BlockBarrel extends BlockContainerPrimal {
2424

@@ -120,7 +120,7 @@ public void onBlockPlacedBy(World worldIn, int x, int y, int z, EntityLivingBase
120120
@Override
121121
public void onBlockSidePlacedBy(World worldIn, int x, int y, int z, EntityLivingBase placer, ItemStack itemIn,
122122
int side) {
123-
int metayaw = FacingUtils.getMetaYawSide(placer.rotationYaw, side);
123+
int metayaw = BlockUtils.getMetaYawSide(placer.rotationYaw, side);
124124
TileEntity te = worldIn.getTileEntity(x, y, z);
125125
if (te instanceof TileEntityBarrel tef) {
126126
tef.setFacingMeta(metayaw);

‎src/main/java/net/pufferlab/primal/blocks/BlockCampfire.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import net.pufferlab.primal.recipes.CampfireRecipe;
2222
import net.pufferlab.primal.tileentities.TileEntityCampfire;
2323
import net.pufferlab.primal.tileentities.TileEntityInventory;
24+
import net.pufferlab.primal.utils.BlockUtils;
2425
import net.pufferlab.primal.utils.ItemUtils;
2526

2627
import com.falsepattern.rple.api.common.block.RPLECustomBlockBrightness;
@@ -86,9 +87,9 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
8687
worldIn.setBlockMetadataWithNotify(x, y, z, meta + 1, 2);
8788
TileEntity te = worldIn.getTileEntity(x, y, z);
8889
if (meta == 0) {
89-
Utils.playSound(worldIn, x, y, z, Registry.thatch);
90+
BlockUtils.playSound(worldIn, x, y, z, Registry.thatch);
9091
} else {
91-
Utils.playSound(worldIn, x, y, z, Registry.log_pile);
92+
BlockUtils.playSound(worldIn, x, y, z, Registry.log_pile);
9293
}
9394
if (te instanceof TileEntityCampfire tef) {
9495
tef.addInventorySlotContentsUpdate(meta + 1, player);

‎src/main/java/net/pufferlab/primal/blocks/BlockContainerPrimal.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.pufferlab.primal.items.itemblocks.ItemBlockPrimal;
1818
import net.pufferlab.primal.tileentities.TileEntityInventory;
1919
import net.pufferlab.primal.tileentities.TileEntityMetaFacing;
20-
import net.pufferlab.primal.utils.FacingUtils;
20+
import net.pufferlab.primal.utils.BlockUtils;
2121

2222
public abstract class BlockContainerPrimal extends BlockContainer implements IPrimalBlock {
2323

@@ -41,8 +41,8 @@ public void onBlockSidePlacedBy(World worldIn, int x, int y, int z, EntityLiving
4141
if (!isSideDependant()) {
4242
side2 = 0;
4343
}
44-
int metayaw = FacingUtils.getMetaYawSide(placer.rotationYaw, side2);
45-
int metaaxis = FacingUtils.getAxis(side);
44+
int metayaw = BlockUtils.getMetaYawSide(placer.rotationYaw, side2);
45+
int metaaxis = BlockUtils.getAxis(side);
4646
if (createTileOnPlace()) {
4747
setFacingTileEntity(worldIn, x, y, z, metayaw, metaaxis);
4848
}

‎src/main/java/net/pufferlab/primal/blocks/BlockForge.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
import net.pufferlab.primal.Registry;
1515
import net.pufferlab.primal.Utils;
1616
import net.pufferlab.primal.tileentities.TileEntityForge;
17+
import net.pufferlab.primal.utils.BlockUtils;
1718
import net.pufferlab.primal.utils.HeatUtils;
1819
import net.pufferlab.primal.utils.ItemUtils;
1920

@@ -64,7 +65,7 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
6465
int meta = worldIn.getBlockMetadata(x, y, z);
6566
if (te instanceof TileEntityForge tef) {
6667
if (Utils.containsOreDict(heldItem, Constants.charcoalPileOreDicts) && meta < 5) {
67-
Utils.playSound(worldIn, x, y, z, Registry.charcoal_pile);
68+
BlockUtils.playSound(worldIn, x, y, z, Registry.charcoal_pile);
6869
tef.addInventorySlotContentsUpdate(meta, player);
6970
worldIn.setBlockMetadataWithNotify(x, y, z, meta + 1, 2);
7071
tef.sendFuelUpdate();

‎src/main/java/net/pufferlab/primal/blocks/BlockOven.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
import net.pufferlab.primal.items.itemblocks.ItemBlockPrimal;
1818
import net.pufferlab.primal.tileentities.TileEntityCampfire;
1919
import net.pufferlab.primal.tileentities.TileEntityOven;
20-
import net.pufferlab.primal.utils.FacingUtils;
20+
import net.pufferlab.primal.utils.BlockUtils;
2121
import net.pufferlab.primal.utils.ItemUtils;
2222

2323
public class BlockOven extends BlockCampfire {
@@ -65,9 +65,9 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
6565
worldIn.setBlockMetadataWithNotify(x, y, z, meta + 1, 2);
6666
TileEntity te = worldIn.getTileEntity(x, y, z);
6767
if (meta == 0) {
68-
Utils.playSound(worldIn, x, y, z, Registry.thatch);
68+
BlockUtils.playSound(worldIn, x, y, z, Registry.thatch);
6969
} else {
70-
Utils.playSound(worldIn, x, y, z, Registry.log_pile);
70+
BlockUtils.playSound(worldIn, x, y, z, Registry.log_pile);
7171
}
7272
if (te instanceof TileEntityCampfire tef) {
7373
tef.addInventorySlotContentsUpdate(meta + 1, player);
@@ -122,7 +122,7 @@ public void randomDisplayTick(World worldIn, int x, int y, int z, Random random)
122122
random.nextFloat() * 0.7F + 0.3F,
123123
false);
124124
}
125-
ForgeDirection dir = FacingUtils.getDirectionFromFacing(tef.facingMeta);
125+
ForgeDirection dir = BlockUtils.getDirectionFromFacing(tef.facingMeta);
126126
int offsetX = dir.offsetX;
127127
int offsetZ = dir.offsetZ;
128128
int newX = x;

‎src/main/java/net/pufferlab/primal/blocks/BlockPile.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import net.pufferlab.primal.Utils;
2525
import net.pufferlab.primal.tileentities.TileEntityInventory;
2626
import net.pufferlab.primal.tileentities.TileEntityMetaFacing;
27-
import net.pufferlab.primal.utils.FacingUtils;
27+
import net.pufferlab.primal.utils.BlockUtils;
2828

2929
import cpw.mods.fml.relauncher.Side;
3030
import cpw.mods.fml.relauncher.SideOnly;
@@ -75,7 +75,7 @@ public void onBlockSidePlacedBy(World worldIn, int x, int y, int z, EntityLiving
7575
if (below instanceof TileEntityMetaFacing pile2) {
7676
pile.setFacingMeta(pile2.facingMeta);
7777
} else {
78-
int metayaw = FacingUtils.getMetaYaw(placer.rotationYaw);
78+
int metayaw = BlockUtils.getMetaYaw(placer.rotationYaw);
7979
TileEntity te = worldIn.getTileEntity(x, y, z);
8080
if (te instanceof TileEntityMetaFacing tef) {
8181
tef.setFacingMeta(metayaw);

‎src/main/java/net/pufferlab/primal/blocks/BlockPitKiln.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
import net.pufferlab.primal.recipes.PitKilnRecipe;
2424
import net.pufferlab.primal.tileentities.TileEntityInventory;
2525
import net.pufferlab.primal.tileentities.TileEntityPitKiln;
26-
import net.pufferlab.primal.utils.FacingUtils;
26+
import net.pufferlab.primal.utils.BlockUtils;
2727

2828
public class BlockPitKiln extends BlockContainerPrimal {
2929

@@ -64,13 +64,13 @@ public boolean onBlockActivated(World worldIn, int x, int y, int z, EntityPlayer
6464
int meta = worldIn.getBlockMetadata(x, y, z);
6565
if (te instanceof TileEntityPitKiln tef) {
6666
ItemStack heldItem = player.getHeldItem();
67-
if (FacingUtils.hasSolidWalls(worldIn, x, y, z)) {
67+
if (BlockUtils.hasSolidWalls(worldIn, x, y, z)) {
6868
if ((Utils.containsOreDict(heldItem, "straw") && meta >= 0 && meta <= 4)
6969
|| (Utils.containsOreDict(heldItem, Constants.logPileOreDicts) && meta >= 5 && meta <= 7)) {
7070
if (meta <= 4) {
71-
Utils.playSound(worldIn, x, y, z, Registry.thatch);
71+
BlockUtils.playSound(worldIn, x, y, z, Registry.thatch);
7272
} else {
73-
Utils.playSound(worldIn, x, y, z, Registry.log_pile);
73+
BlockUtils.playSound(worldIn, x, y, z, Registry.log_pile);
7474
}
7575
tef.addInventorySlotContentsUpdate(5 + meta, player);
7676
worldIn.setBlockMetadataWithNotify(x, y, z, meta + 1, 2);
@@ -136,7 +136,7 @@ public boolean addOrRemoveItem(World world, int x, int y, int z, EntityPlayer pl
136136
@Override
137137
public void onNeighborBlockChange(World worldIn, int x, int y, int z, Block neighbor) {
138138
super.onNeighborBlockChange(worldIn, x, y, z, neighbor);
139-
boolean hasWalls = FacingUtils.hasSolidWalls(worldIn, x, y, z);
139+
boolean hasWalls = BlockUtils.hasSolidWalls(worldIn, x, y, z);
140140
if (!hasWalls) {
141141
clearLayers(worldIn, x, y, z);
142142
}

‎src/main/java/net/pufferlab/primal/client/models/ModelPrimal.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
import net.pufferlab.primal.client.helper.ModelTESS;
1111
import net.pufferlab.primal.client.utils.ModelBase;
1212
import net.pufferlab.primal.client.utils.ModelRenderer;
13-
import net.pufferlab.primal.utils.FacingUtils;
13+
import net.pufferlab.primal.utils.BlockUtils;
1414

1515
public abstract class ModelPrimal extends ModelBase {
1616

@@ -94,7 +94,7 @@ public ModelPrimal setType(int type) {
9494
}
9595

9696
public void setFacing(int meta) {
97-
float angle = FacingUtils.getFacingAngle(meta);
97+
float angle = BlockUtils.getFacingAngle(meta);
9898
float add = 0.0F;
9999
if (invertRot()) {
100100
add = (float) Math.toRadians(180);
@@ -106,7 +106,7 @@ public void setFacing(int meta) {
106106
}
107107

108108
public void setFacingFromAxis(int facingMeta, int axisMeta) {
109-
float angle = FacingUtils.getFacingAngle(facingMeta);
109+
float angle = BlockUtils.getFacingAngle(facingMeta);
110110

111111
if (axisMeta == 1) {
112112
bb_main.rotateAngleX = (float) (Math.PI / 2);

0 commit comments

Comments
 (0)