Ellpeck/ActuallyAdditions
1
0
Fork 0
mirror of https://github.com/Ellpeck/ActuallyAdditions.git synced 2024-11-22 15:18:34 +01:00
Code Issues Projects Releases Wiki Activity

rerun the formatter

Browse source
This commit is contained in:
Shadows_of_Fire 2019-05-02 04:43:27 -04:00
parent ea57f49c8b
commit ded3877b41
6 changed files with 127 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/de/ellpeck/actuallyadditions/mod/blocks/base/BlockPlant.java
View file

@ -1,12 +1,12 @@
/* /*
* This file ("BlockPlant.java") is part of the Actually Additions mod for Minecraft. * This file ("BlockPlant.java") is part of the Actually Additions mod for Minecraft.
* It is created and owned by Ellpeck and distributed * It is created and owned by Ellpeck and distributed
* under the Actually Additions License to be found at * under the Actually Additions License to be found at
* http://ellpeck.de/actaddlicense * http://ellpeck.de/actaddlicense
* View the source code at https://github.com/Ellpeck/ActuallyAdditions * View the source code at https://github.com/Ellpeck/ActuallyAdditions
* *
* © 2015-2017 Ellpeck * © 2015-2017 Ellpeck
*/ */
package de.ellpeck.actuallyadditions.mod.blocks.base; package de.ellpeck.actuallyadditions.mod.blocks.base;
@ -103,7 +103,7 @@ public class BlockPlant extends BlockCrops implements ItemBlockBase.ICustomRarit
drop.shrink(1); drop.shrink(1);
deductedSeedSize = true; deductedSeedSize = true;
} }
if(StackUtil.isValid(drop)){ if (StackUtil.isValid(drop)) {
ItemHandlerHelper.giveItemToPlayer(player, drop); ItemHandlerHelper.giveItemToPlayer(player, drop);
} }
} }

1
src/main/java/de/ellpeck/actuallyadditions/mod/config/values/ConfigStringListValues.java
View file

@ -85,7 +85,6 @@ public enum ConfigStringListValues {
new String[0], new String[0],
"The items that aren't allowed to be put in the Repairer. Use REGISTRY NAMES, and if metadata is needed, add it like so: somemod:some_block@3"); "The items that aren't allowed to be put in the Repairer. Use REGISTRY NAMES, and if metadata is needed, add it like so: somemod:some_block@3");
public final String name; public final String name;
public final String category; public final String category;
public final String[] defaultValue; public final String[] defaultValue;

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityBase.java
View file

@ -163,7 +163,7 @@ public abstract class TileEntityBase extends TileEntity implements ITickable {
if(this.world != null && !this.world.isRemote){ if(this.world != null && !this.world.isRemote){
NBTTagCompound compound = new NBTTagCompound(); NBTTagCompound compound = new NBTTagCompound();
this.writeSyncableNBT(compound, NBTType.SYNC); this.writeSyncableNBT(compound, NBTType.SYNC);
NBTTagCompound data = new NBTTagCompound(); NBTTagCompound data = new NBTTagCompound();
data.setTag("Data", compound); data.setTag("Data", compound);
data.setInteger("X", this.pos.getX()); data.setInteger("X", this.pos.getX());

2
src/main/java/de/ellpeck/actuallyadditions/mod/tile/TileEntityLaserRelay.java
View file

@ -109,7 +109,7 @@ public abstract class TileEntityLaserRelay extends TileEntityInventoryBase {
this.renderParticles(); this.renderParticles();
} }
} }
@SideOnly(Side.CLIENT) @SideOnly(Side.CLIENT)
public void renderParticles(){ public void renderParticles(){
if(this.world.rand.nextInt(8) == 0){ if(this.world.rand.nextInt(8) == 0){

16
src/main/java/de/ellpeck/actuallyadditions/mod/util/AssetUtil.java
View file

@ -289,42 +289,42 @@ public final class AssetUtil {
/*if(r != r2 || g != g2 || b != b2){ /*if(r != r2 || g != g2 || b != b2){
render.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR); render.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
Minecraft.getMinecraft().renderEngine.bindTexture(ClientUtil.LIGHT_BEAM_GRADIENT); Minecraft.getMinecraft().renderEngine.bindTexture(ClientUtil.LIGHT_BEAM_GRADIENT);
render.pos(length, -beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex();
render.pos(length, beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex();
render.pos(0, beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex();
render.pos(0, -beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex();
render.pos(length, -beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, -beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex();
render.pos(length, -beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex();
render.pos(0, -beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex();
render.pos(0, beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex();
render.pos(length, beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, -beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, -beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, beamWidth, -beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex();
render.pos(length, beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex();
render.pos(0, beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex();
render.pos(0, beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex();
render.pos(length, beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(length, beamWidth, -beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, -beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(0, beamWidth, beamWidth).tex(0, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, -beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(0, 0).color(r, g, b, alpha).endVertex();
render.pos(length, -beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(0, 1).color(r, g, b, alpha).endVertex();
render.pos(0, -beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(1, 1).color(r, g, b, alpha).endVertex();
render.pos(0, -beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex(); render.pos(0, -beamWidth, -beamWidth).tex(1, 0).color(r, g, b, alpha).endVertex();
render.pos(length, -beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, -beamWidth).tex(1, 0).color(r2, g2, b2, alpha).endVertex();
render.pos(length, -beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(length, -beamWidth, beamWidth).tex(1, 1).color(r2, g2, b2, alpha).endVertex();
render.pos(0, -beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex(); render.pos(0, -beamWidth, beamWidth).tex(0, 1).color(r2, g2, b2, alpha).endVertex();

216
src/main/java/de/ellpeck/actuallyadditions/mod/util/NetHandlerSpaghettiServer.java
View file

@ -42,149 +42,149 @@ import net.minecraftforge.common.util.FakePlayer;
public class NetHandlerSpaghettiServer extends NetHandlerPlayServer { public class NetHandlerSpaghettiServer extends NetHandlerPlayServer {
public NetHandlerSpaghettiServer(FakePlayer player) { public NetHandlerSpaghettiServer(FakePlayer player) {
super(null, new NetworkManager(EnumPacketDirection.CLIENTBOUND), player); super(null, new NetworkManager(EnumPacketDirection.CLIENTBOUND), player);
} }
@Override @Override
public void disconnect(ITextComponent textComponent) { public void disconnect(ITextComponent textComponent) {
} }
@Override @Override
public void func_194308_a(CPacketPlaceRecipe p_194308_1_) { public void func_194308_a(CPacketPlaceRecipe p_194308_1_) {
} }
@Override @Override
public void handleAnimation(CPacketAnimation packetIn) { public void handleAnimation(CPacketAnimation packetIn) {
} }
@Override @Override
public void handleRecipeBookUpdate(CPacketRecipeInfo p_191984_1_) { public void handleRecipeBookUpdate(CPacketRecipeInfo p_191984_1_) {
} }
@Override @Override
public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) { public void handleResourcePackStatus(CPacketResourcePackStatus packetIn) {
} }
@Override @Override
public void handleSeenAdvancements(CPacketSeenAdvancements p_194027_1_) { public void handleSeenAdvancements(CPacketSeenAdvancements p_194027_1_) {
} }
@Override @Override
public void handleSpectate(CPacketSpectate packetIn) { public void handleSpectate(CPacketSpectate packetIn) {
} }
@Override @Override
public void onDisconnect(ITextComponent reason) { public void onDisconnect(ITextComponent reason) {
} }
@Override @Override
public void processChatMessage(CPacketChatMessage packetIn) { public void processChatMessage(CPacketChatMessage packetIn) {
} }
@Override @Override
public void processClickWindow(CPacketClickWindow packetIn) { public void processClickWindow(CPacketClickWindow packetIn) {
} }
@Override @Override
public void processClientSettings(CPacketClientSettings packetIn) { public void processClientSettings(CPacketClientSettings packetIn) {
} }
@Override @Override
public void processClientStatus(CPacketClientStatus packetIn) { public void processClientStatus(CPacketClientStatus packetIn) {
} }
@Override @Override
public void processCloseWindow(CPacketCloseWindow packetIn) { public void processCloseWindow(CPacketCloseWindow packetIn) {
} }
@Override @Override
public void processConfirmTeleport(CPacketConfirmTeleport packetIn) { public void processConfirmTeleport(CPacketConfirmTeleport packetIn) {
} }
@Override @Override
public void processConfirmTransaction(CPacketConfirmTransaction packetIn) { public void processConfirmTransaction(CPacketConfirmTransaction packetIn) {
} }
@Override @Override
public void processCreativeInventoryAction(CPacketCreativeInventoryAction packetIn) { public void processCreativeInventoryAction(CPacketCreativeInventoryAction packetIn) {
} }
@Override @Override
public void processCustomPayload(CPacketCustomPayload packetIn) { public void processCustomPayload(CPacketCustomPayload packetIn) {
} }
@Override @Override
public void processEnchantItem(CPacketEnchantItem packetIn) { public void processEnchantItem(CPacketEnchantItem packetIn) {
} }
@Override @Override
public void processEntityAction(CPacketEntityAction packetIn) { public void processEntityAction(CPacketEntityAction packetIn) {
} }
@Override @Override
public void processHeldItemChange(CPacketHeldItemChange packetIn) { public void processHeldItemChange(CPacketHeldItemChange packetIn) {
} }
@Override @Override
public void processInput(CPacketInput packetIn) { public void processInput(CPacketInput packetIn) {
} }
@Override @Override
public void processKeepAlive(CPacketKeepAlive packetIn) { public void processKeepAlive(CPacketKeepAlive packetIn) {
} }
@Override @Override
public void processPlayer(CPacketPlayer packetIn) { public void processPlayer(CPacketPlayer packetIn) {
} }
@Override @Override
public void processPlayerAbilities(CPacketPlayerAbilities packetIn) { public void processPlayerAbilities(CPacketPlayerAbilities packetIn) {
} }
@Override @Override
public void processPlayerDigging(CPacketPlayerDigging packetIn) { public void processPlayerDigging(CPacketPlayerDigging packetIn) {
} }
@Override @Override
public void processSteerBoat(CPacketSteerBoat packetIn) { public void processSteerBoat(CPacketSteerBoat packetIn) {
} }
@Override @Override
public void processTabComplete(CPacketTabComplete packetIn) { public void processTabComplete(CPacketTabComplete packetIn) {
} }
@Override @Override
public void processTryUseItem(CPacketPlayerTryUseItem packetIn) { public void processTryUseItem(CPacketPlayerTryUseItem packetIn) {
} }
@Override @Override
public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) { public void processTryUseItemOnBlock(CPacketPlayerTryUseItemOnBlock packetIn) {
} }
@Override @Override
public void processUpdateSign(CPacketUpdateSign packetIn) { public void processUpdateSign(CPacketUpdateSign packetIn) {
} }
@Override @Override
public void processUseEntity(CPacketUseEntity packetIn) { public void processUseEntity(CPacketUseEntity packetIn) {
} }
@Override @Override
public void processVehicleMove(CPacketVehicleMove packetIn) { public void processVehicleMove(CPacketVehicleMove packetIn) {
} }
@Override @Override
public void sendPacket(Packet<?> packetIn) { public void sendPacket(Packet<?> packetIn) {
} }
@Override @Override
public void setPlayerLocation(double x, double y, double z, float yaw, float pitch) { public void setPlayerLocation(double x, double y, double z, float yaw, float pitch) {
} }
@Override @Override
public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set<EnumFlags> relativeSet) { public void setPlayerLocation(double x, double y, double z, float yaw, float pitch, Set<EnumFlags> relativeSet) {
} }
} }