mirror of
https://github.com/GTNewHorizons/Binnie.git
synced 2026-11-22 13:09:47 +00:00
Minor cleanups (#50)
* Finalize, minor alloc reduction Also enable Jabel and generic injection * Update dependencies.gradle * Clean up Machine a bit * spotless more enhanced instanceof * Update ModuleMachine.java * More clen * WARN: Removed exception catching * Many, many tiny patches + birthday fix * Spotless * Spotless again * Fix getLow and clamp tolerance value * Revert event -> ignored on unused event parameters * Rename instanceof variables * Update Machine.java * Use StringBuilder * Cache getStack() * Oops, Jabel can't handle that * Spotless * Spotless again My IDE was fighting with it * Remove unused elements + scream test success
This commit is contained in:
1 parent
6b4f3eb1c7
commit
f0f14bb278
325 files changed
+1205
-1868
No files matched your search
@@ -62,7 +62,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addBlockTooltip(ItemStack itemStack, List tooltip) {
|
||||
public void addBlockTooltip(ItemStack itemStack, List<String> tooltip) {
|
||||
// ignored
|
||||
}
|
||||
|
||||
@@ -97,7 +97,7 @@ public class BlockMetadata extends BlockContainer implements IBlockMetadata {
|
||||
|
||||
boolean hasBeenBroken = world.setBlockToAir(i, j, k);
|
||||
if (hasBeenBroken && BinnieCore.proxy.isSimulating(world)
|
||||
&& drops.size() > 0
|
||||
&& !drops.isEmpty()
|
||||
&& (player == null || !player.capabilities.isCreativeMode)) {
|
||||
for (ItemStack drop : drops) {
|
||||
block.dropAsStack(world, i, j, k, drop);
|
||||
|
||||
@@ -15,7 +15,7 @@ public interface IBlockMetadata extends ITileEntityProvider {
|
||||
|
||||
String getBlockName(ItemStack itemStack);
|
||||
|
||||
void addBlockTooltip(ItemStack itemStack, List tooltip);
|
||||
void addBlockTooltip(ItemStack itemStack, List<String> tooltip);
|
||||
|
||||
void dropAsStack(World world, int x, int y, int z, ItemStack itemStack);
|
||||
}
|
||||
@@ -19,11 +19,6 @@ public class ItemMetadata extends ItemBlock {
|
||||
super(block);
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getMetadata(int damage) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean placeBlockAt(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int side,
|
||||
float hitX, float hitY, float hitZ, int metadata) {
|
||||
@@ -56,7 +51,7 @@ public class ItemMetadata extends ItemBlock {
|
||||
|
||||
@Override
|
||||
@SideOnly(Side.CLIENT)
|
||||
public void addInformation(ItemStack itemStack, EntityPlayer player, List tooltip, boolean advanced) {
|
||||
public void addInformation(ItemStack itemStack, EntityPlayer player, List<String> tooltip, boolean advanced) {
|
||||
((IBlockMetadata) field_150939_a).addBlockTooltip(itemStack, tooltip);
|
||||
}
|
||||
|
||||
|
||||
@@ -34,14 +34,10 @@ public class MultipassItemRenderer implements IItemRenderer {
|
||||
|
||||
@Override
|
||||
public boolean handleRenderType(ItemStack item, IItemRenderer.ItemRenderType type) {
|
||||
switch (type) {
|
||||
case ENTITY:
|
||||
case EQUIPPED:
|
||||
case INVENTORY:
|
||||
case EQUIPPED_FIRST_PERSON:
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
return switch (type) {
|
||||
case ENTITY, EQUIPPED, INVENTORY, EQUIPPED_FIRST_PERSON -> true;
|
||||
default -> false;
|
||||
};
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
Reference in new issue
Block a user