conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
playerToAdd.addChatMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.spacestation.added", playerBase.getGameProfile().getName())));
=======
playerToAdd.addChatMessage(new ChatComponentText(GCCoreUtil.translateWithFormat("gui.spacestation.added", PlayerUtil.getName(playerBase))));
>>>>>>>
playerToAdd.addChatMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.spacestation.added", PlayerUtil.getName(playerBase)))); |
<<<<<<<
IStatsCapability stats = player.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
this.stacks = NonNullList.withSize(stats.getRocketStacks().size() + 1, ItemStack.EMPTY);
=======
GCPlayerStats stats = GCPlayerStats.get(player);
this.containedItems = new ItemStack[stats.getRocketStacks().length + 1];
>>>>>>>
GCPlayerStats stats = GCPlayerStats.get(player);
this.stacks = NonNullList.withSize(stats.getRocketStacks().size() + 1, ItemStack.EMPTY); |
<<<<<<<
protected static final AxisAlignedBB BOUNDING_BOX = new AxisAlignedBB(0.0D, 6 / 16.0D, 0.0D, 1.0D, HEIGHT, 1.0D);
protected static final AxisAlignedBB BOUNDING_BOX_ZEROG = new AxisAlignedBB(0.0D, 6 / 16.0D, 0.0D, 1.0D, 1.0D, 1.0D);;
=======
public static boolean ignoreCollisionTests;
>>>>>>>
protected static final AxisAlignedBB BOUNDING_BOX = new AxisAlignedBB(0.0D, 6 / 16.0D, 0.0D, 1.0D, HEIGHT, 1.0D);
protected static final AxisAlignedBB BOUNDING_BOX_ZEROG = new AxisAlignedBB(0.0D, 6 / 16.0D, 0.0D, 1.0D, 1.0D, 1.0D);;
public static boolean ignoreCollisionTests;
<<<<<<<
if (bs.getBlock() == this && bs.getValue(BlockPlatform.CORNER) == BlockPlatform.EnumCorner.NE)
return new AxisAlignedBB((double)pos.getX() + 9/16D, (double)pos.getY(), (double)pos.getZ() + 9/16D, (double)pos.getX() + 1.0D, (double)pos.getY() + HEIGHT, (double)pos.getZ() + 1.0D);
=======
IBlockState bs = worldIn.getBlockState(pos);
if (bs.getBlock() == this && bs.getValue(BlockPlatform.CORNER) == BlockPlatform.EnumCorner.SE)
return new AxisAlignedBB((double)pos.getX() + 9/16D, (double)pos.getY() + this.minY, (double)pos.getZ() + 9/16D, (double)pos.getX() + this.maxX, (double)pos.getY() + this.maxY, (double)pos.getZ() + this.maxZ);
>>>>>>>
if (bs.getBlock() == this && bs.getValue(BlockPlatform.CORNER) == BlockPlatform.EnumCorner.SE)
return new AxisAlignedBB((double)pos.getX() + 9/16D, (double)pos.getY(), (double)pos.getZ() + 9/16D, (double)pos.getX() + 1.0D, (double)pos.getY() + HEIGHT, (double)pos.getZ() + 1.0D); |
<<<<<<<
import org.python.pydev.shared_core.string.StringUtils;
=======
import org.python.pydev.shared_core.SharedCorePlugin;
>>>>>>>
import org.python.pydev.shared_core.SharedCorePlugin;
import org.python.pydev.shared_core.string.StringUtils; |
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase, 1, 12), new Object[] { "WXW", "WYW", "WZW", 'W', "ingotAluminum", 'X', Blocks.ANVIL, 'Y', "ingotCopper", 'Z', "waferBasic" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase2, 1, 0), new Object[] { "WXW", "WYW", "VZV", 'V', new ItemStack(GCBlocks.aluminumWire), 'W', "compressedSteel", 'X', Blocks.ANVIL, 'Y', "compressedBronze", 'Z', "waferAdvanced" });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase, 1, 12), new Object[] { "WXW", "WYW", "WZW", 'W', "ingotAluminum", 'X', Blocks.anvil, 'Y', "ingotCopper", 'Z', "waferBasic" });
//Electric Compressor - 2 recipes
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase2, 1, 0), new Object[] { "WXW", "WYW", "VZV", 'V', new ItemStack(GCBlocks.aluminumWire), 'W', "compressedSteel", 'X', Blocks.anvil, 'Y', "compressedBronze", 'Z', "waferAdvanced" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase2, 1, 0), new Object[] { "WXW", "WYW", "VZV", 'V', new ItemStack(GCBlocks.aluminumWire), 'W', "compressedSteel", 'X', "compressedTin", 'Y', new ItemStack(GCBlocks.machineBase, 1, 12), 'Z', "waferAdvanced" });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase, 1, 12), new Object[] { "WXW", "WYW", "WZW", 'W', "ingotAluminum", 'X', Blocks.ANVIL, 'Y', "ingotCopper", 'Z', "waferBasic" });
//Electric Compressor - 2 recipes
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase2, 1, 0), new Object[] { "WXW", "WYW", "VZV", 'V', new ItemStack(GCBlocks.aluminumWire), 'W', "compressedSteel", 'X', Blocks.ANVIL, 'Y', "compressedBronze", 'Z', "waferAdvanced" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.machineBase2, 1, 0), new Object[] { "WXW", "WYW", "VZV", 'V', new ItemStack(GCBlocks.aluminumWire), 'W', "compressedSteel", 'X', "compressedTin", 'Y', new ItemStack(GCBlocks.machineBase, 1, 12), 'Z', "waferAdvanced" });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 1, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', Items.REDSTONE, 'C', Items.COAL });
=======
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 2, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', Items.redstone, 'C', Items.coal });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCItems.battery, 2, 100), new Object[] { " T ", "TRT", "TCT", 'T', "compressedTin", 'R', Items.REDSTONE, 'C', Items.COAL }); |
<<<<<<<
list.add(this.getEnergyStorageModule());
list.add(this.getElectricFurnace());
if (GalacticraftCore.isPlanetsLoaded)
{
list.add(this.getEnergyStorageCluster());
list.add(this.getElectricArcFurnace());
}
=======
par3List.add(this.getEnergyStorageModule());
par3List.add(this.getElectricFurnace());
par3List.add(this.getEnergyStorageCluster());
par3List.add(this.getElectricArcFurnace());
>>>>>>>
list.add(this.getEnergyStorageModule());
list.add(this.getElectricFurnace());
list.add(this.getEnergyStorageCluster());
list.add(this.getElectricArcFurnace()); |
<<<<<<<
=======
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
>>>>>>>
import net.minecraft.tileentity.TileEntity; |
<<<<<<<
status = GCCoreUtil.translate("gui.oxygen_use.desc") + ": " + this.sealer.oxygenPerTick * 20 + GCCoreUtil.translate("gui.per_second");
=======
int adjustedOxygenPerTick = (int) (this.sealer.oxygenPerTick * 20);
if (this.sealer.disabled || this.sealer.getEnergyStoredGC() < this.sealer.storage.getMaxExtract()) adjustedOxygenPerTick = 0;
status = GCCoreUtil.translate("gui.oxygenUse.desc") + ": " + adjustedOxygenPerTick + GCCoreUtil.translate("gui.perSecond");
>>>>>>>
int adjustedOxygenPerTick = (int) (this.sealer.oxygenPerTick * 20);
if (this.sealer.disabled || this.sealer.getEnergyStoredGC() < this.sealer.storage.getMaxExtract()) adjustedOxygenPerTick = 0;
status = GCCoreUtil.translate("gui.oxygen_use.desc") + ": " + this.sealer.oxygenPerTick * 20 + GCCoreUtil.translate("gui.per_second"); |
<<<<<<<
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.SoundCategory;
<<<<<<<
public ITextComponent getDisplayName()
{
return null;
}
@Override
=======
>>>>>>> |
<<<<<<<
int padding = gearData.getThermalPadding(slotIn.getSlotIndex() - 1);
if (padding >= 0)
=======
int padding = gearData.getThermalPadding(armorSlot - 1);
if (padding != GCPlayerHandler.GEAR_NOT_PRESENT)
>>>>>>>
int padding = gearData.getThermalPadding(slotIn.getSlotIndex() - 1);
if (padding != GCPlayerHandler.GEAR_NOT_PRESENT) |
<<<<<<<
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.IInventory;
=======
>>>>>>>
import net.minecraft.init.SoundEvents;
<<<<<<<
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.SoundCategory;
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public boolean hasCustomName()
{
return false;
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
// TODO: Find a more efficient way to fix this
// Broken since 1.8 and this is an inefficient fix
for (int x = -1; x < 2; x++)
{
for (int z = -1; z < 2; z++)
{
if (!(x == 0 && z == 0))
{
final BlockPos vecToAdd = new BlockPos(getPos().getX() + x, getPos().getY(), getPos().getZ() + z);
TileEntity tile = this.world.getTileEntity(vecToAdd);
if (tile instanceof TileEntityMulti)
{
BlockPos pos = ((TileEntityMulti) tile).mainBlockPosition;
if (pos == null || !pos.equals(getPos()))
{
((TileEntityMulti) tile).mainBlockPosition = getPos();
}
}
}
}
}
=======
>>>>>>>
<<<<<<<
this.world.destroyBlock(thisBlock, true);
for (int x = -1; x < 2; x++)
=======
for (BlockPos pos : positions)
>>>>>>>
for (BlockPos pos : positions)
<<<<<<<
BlockPos pos = new BlockPos(thisBlock.getX() + x, thisBlock.getY(), thisBlock.getZ() + z);
if (this.world.isRemote && this.world.rand.nextDouble() < 0.1D)
=======
if (this.worldObj.isRemote && this.worldObj.rand.nextDouble() < 0.1D)
>>>>>>>
if (this.world.isRemote && this.world.rand.nextDouble() < 0.1D) |
<<<<<<<
this.setPosition(this.targetVec.getX() + 0.5F, this.targetVec.getY() + 800, this.targetVec.getZ() + 0.5F);
=======
this.setPosition(this.targetVec.x + 0.5F, this.targetVec.y + 800, this.targetVec.z + 0.5F);
//Stop any lateral motion, otherwise it will update to an incorrect x,z position first tick after spawning above target
this.motionX = this.motionZ = 0.0D;
//Small upward motion initially, to keep clear of own flame trail from launch
this.motionY = 0.1D;
>>>>>>>
this.setPosition(this.targetVec.getX() + 0.5F, this.targetVec.getY() + 800, this.targetVec.getZ() + 0.5F);
//Stop any lateral motion, otherwise it will update to an incorrect x,z position first tick after spawning above target
this.motionX = this.motionZ = 0.0D;
//Small upward motion initially, to keep clear of own flame trail from launch
this.motionY = 0.1D; |
<<<<<<<
public GuiCelestialSelection(boolean mapMode, List<CelestialBody> possibleBodies, boolean canCreateStations)
=======
// String colours
protected static final int WHITE = ColorUtil.to32BitColor(255, 255, 255, 255);
protected static final int GREY5 = ColorUtil.to32BitColor(255, 150, 150, 150);
protected static final int GREY4 = ColorUtil.to32BitColor(255, 140, 140, 140);
protected static final int GREY3 = ColorUtil.to32BitColor(255, 120, 120, 120);
protected static final int GREY2 = ColorUtil.to32BitColor(255, 100, 100, 100);
protected static final int GREY1 = ColorUtil.to32BitColor(255, 80, 80, 80);
protected static final int GREY0 = ColorUtil.to32BitColor(255, 40, 40, 40);
protected static final int GREEN = ColorUtil.to32BitColor(255, 0, 255, 0);
protected static final int RED = ColorUtil.to32BitColor(255, 255, 0, 0);
protected static final int RED3 = ColorUtil.to32BitColor(255, 255, 100, 100);
protected static final int CYAN = ColorUtil.to32BitColor(255, 150, 200, 255);
public GuiCelestialSelection(boolean mapMode, List<CelestialBody> possibleBodies)
>>>>>>>
// String colours
protected static final int WHITE = ColorUtil.to32BitColor(255, 255, 255, 255);
protected static final int GREY5 = ColorUtil.to32BitColor(255, 150, 150, 150);
protected static final int GREY4 = ColorUtil.to32BitColor(255, 140, 140, 140);
protected static final int GREY3 = ColorUtil.to32BitColor(255, 120, 120, 120);
protected static final int GREY2 = ColorUtil.to32BitColor(255, 100, 100, 100);
protected static final int GREY1 = ColorUtil.to32BitColor(255, 80, 80, 80);
protected static final int GREY0 = ColorUtil.to32BitColor(255, 40, 40, 40);
protected static final int GREEN = ColorUtil.to32BitColor(255, 0, 255, 0);
protected static final int RED = ColorUtil.to32BitColor(255, 255, 0, 0);
protected static final int RED3 = ColorUtil.to32BitColor(255, 255, 100, 100);
protected static final int CYAN = ColorUtil.to32BitColor(255, 150, 200, 255);
public GuiCelestialSelection(boolean mapMode, List<CelestialBody> possibleBodies, boolean canCreateStations) |
<<<<<<<
import net.minecraft.util.math.BlockPos;
=======
import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
import net.minecraft.util.math.MathHelper;
>>>>>>>
import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
<<<<<<<
Random random = this.world.setRandomSeed(k, l, 10387312);
k = k * numChunks;
l = l * numChunks;
k = k + random.nextInt(numChunks);
l = l + random.nextInt(numChunks);
return i == k && j == l;
=======
Random random = world.setRandomSeed(k, l, 10387340 + world.provider.getDimension());
k = k * numChunks + random.nextInt(numChunks);
l = l * numChunks + random.nextInt(numChunks);
return (((long) k) << 32) + l;
}
/**
* This returns an angle between 0 and 360 degrees. 0 degrees means due North from the current (x, z) position
* Only provides meaningful results in worlds with dungeon generation using this class!
*/
public static float directionToNearestDungeon(World world, double xpos, double zpos)
{
int spacing = ((IGalacticraftWorldProvider) world.provider).getDungeonSpacing();
int x = MathHelper.floor_double(xpos);
int z = MathHelper.floor_double(zpos);
int quadrantX = x % spacing;
int quadrantZ = z % spacing;
int searchOffsetX = quadrantX / (spacing / 2); //0 or 1
int searchOffsetZ = quadrantZ / (spacing / 2); //0 or 1
double nearestX = 0;
double nearestZ = 0;
double nearestDistance = Double.MAX_VALUE;
for (int cx = searchOffsetX - 1; cx < searchOffsetX + 1; cx++)
{
for (int cz = searchOffsetZ - 1; cz < searchOffsetZ + 1; cz++)
{
long dungeonPos = getDungeonPosForCoords(world, (x + cx * spacing) / 16, (z + cz * spacing) / 16, spacing);
int i = 2 + (((int) (dungeonPos >> 32)) << 4);
int j = 2 + (((int) dungeonPos) << 4); //Java automatically gives the 32 least significant bits
double oX = i - xpos;
double oZ = j - zpos;
double distanceSq = oX * oX + oZ * oZ;
if (distanceSq < nearestDistance)
{
nearestDistance = distanceSq;
nearestX = oX;
nearestZ = oZ;
}
}
}
return GCCoreUtil.getAngleForRelativePosition(nearestX, nearestZ);
>>>>>>>
Random random = world.setRandomSeed(k, l, 10387340 + world.provider.getDimension());
k = k * numChunks + random.nextInt(numChunks);
l = l * numChunks + random.nextInt(numChunks);
return (((long) k) << 32) + l;
}
/**
* This returns an angle between 0 and 360 degrees. 0 degrees means due North from the current (x, z) position
* Only provides meaningful results in worlds with dungeon generation using this class!
*/
public static float directionToNearestDungeon(World world, double xpos, double zpos)
{
int spacing = ((IGalacticraftWorldProvider) world.provider).getDungeonSpacing();
int x = MathHelper.floor(xpos);
int z = MathHelper.floor(zpos);
int quadrantX = x % spacing;
int quadrantZ = z % spacing;
int searchOffsetX = quadrantX / (spacing / 2); //0 or 1
int searchOffsetZ = quadrantZ / (spacing / 2); //0 or 1
double nearestX = 0;
double nearestZ = 0;
double nearestDistance = Double.MAX_VALUE;
for (int cx = searchOffsetX - 1; cx < searchOffsetX + 1; cx++)
{
for (int cz = searchOffsetZ - 1; cz < searchOffsetZ + 1; cz++)
{
long dungeonPos = getDungeonPosForCoords(world, (x + cx * spacing) / 16, (z + cz * spacing) / 16, spacing);
int i = 2 + (((int) (dungeonPos >> 32)) << 4);
int j = 2 + (((int) dungeonPos) << 4); //Java automatically gives the 32 least significant bits
double oX = i - xpos;
double oZ = j - zpos;
double distanceSq = oX * oX + oZ * oZ;
if (distanceSq < nearestDistance)
{
nearestDistance = distanceSq;
nearestX = oX;
nearestZ = oZ;
}
}
}
return GCCoreUtil.getAngleForRelativePosition(nearestX, nearestZ); |
<<<<<<<
@Override
public DimensionType getDimensionType()
{
return GCPlanetDimensions.ASTEROIDS;
}
=======
@Override
public float getArrowGravity()
{
return 0.002F;
}
>>>>>>>
@Override
public DimensionType getDimensionType()
{
return GCPlanetDimensions.ASTEROIDS;
}
public float getArrowGravity()
{
return 0.002F;
} |
<<<<<<<
if (player.getRNG().nextInt(500) == 0 && minecraft.world.provider instanceof WorldProviderVenus)
=======
if (player.getRNG().nextInt(300 + (int) (800F * minecraft.theWorld.rainingStrength)) == 0 && minecraft.theWorld.provider instanceof WorldProviderVenus)
>>>>>>>
if (player.getRNG().nextInt(300 + (int) (800F * minecraft.world.rainingStrength)) == 0 && minecraft.world.provider instanceof WorldProviderVenus)
<<<<<<<
minecraft.world.playSound(player, posX, posY, posZ, SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 1000.0F, 1.0F + player.getRNG().nextFloat() * 0.2F);
=======
minecraft.theWorld.playSound(player, posX, posY, posZ, SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 500.0F + player.getRNG().nextFloat() * 500F, 1.0F + player.getRNG().nextFloat() * 0.2F);
>>>>>>>
minecraft.world.playSound(player, posX, posY, posZ, SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 500.0F + player.getRNG().nextFloat() * 500F, 1.0F + player.getRNG().nextFloat() * 0.2F); |
<<<<<<<
this.move(MoverType.SELF, this.motionX, this.motionY, this.motionZ);
=======
>>>>>>>
<<<<<<<
if (!this.world.isRemote && this.ticks % 5 == 0)
{
GalacticraftCore.packetPipeline.sendToAllAround(new PacketDynamic(this), new TargetPoint(GCCoreUtil.getDimensionID(this.world), this.posX, this.posY, this.posZ, 50.0D));
}
if (this.world.isRemote && this.ticks % 5 == 0)
{
GalacticraftCore.packetPipeline.sendToServer(new PacketDynamic(this));
}
=======
>>>>>>> |
<<<<<<<
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.text.ITextComponent;
=======
import net.minecraft.util.MathHelper;
>>>>>>>
import net.minecraft.util.math.MathHelper;
<<<<<<<
public ITextComponent getDisplayName()
{
return null;
}
@Override
=======
>>>>>>> |
<<<<<<<
=======
private enum CraterSize
{
SMALL(8, 12, 14),
MEDIUM(13, 17, 8),
LARGE(18, 25, 2),
EXTREME(26, 30, 1);
public final int MIN_SIZE;
public final int MAX_SIZE;
private final int PROBABILITY;
private static CraterSize[] sizeArray;
private CraterSize(int min, int max, int prob)
{
this.MIN_SIZE = min;
this.MAX_SIZE = max;
this.PROBABILITY = prob;
}
static
{
int amount = 0;
for(final CraterSize c : CraterSize.values())
{
amount += c.PROBABILITY;
}
CraterSize.sizeArray = new CraterSize[amount];
int pointer = 0;
for(final CraterSize c : CraterSize.values())
{
for(int i = 0; i < c.PROBABILITY; i++)
{
CraterSize.sizeArray[pointer] = c;
pointer++;
}
}
}
}
>>>>>>>
private enum CraterSize
{
SMALL(8, 12, 14),
MEDIUM(13, 17, 8),
LARGE(18, 25, 2),
EXTREME(26, 30, 1);
public final int MIN_SIZE;
public final int MAX_SIZE;
private final int PROBABILITY;
private static CraterSize[] sizeArray;
private CraterSize(int min, int max, int prob)
{
this.MIN_SIZE = min;
this.MAX_SIZE = max;
this.PROBABILITY = prob;
}
static
{
int amount = 0;
for(final CraterSize c : CraterSize.values())
{
amount += c.PROBABILITY;
}
CraterSize.sizeArray = new CraterSize[amount];
int pointer = 0;
for(final CraterSize c : CraterSize.values())
{
for(int i = 0; i < c.PROBABILITY; i++)
{
CraterSize.sizeArray[pointer] = c;
pointer++;
}
}
}
}
<<<<<<<
noiseGen1 = new Gradient(rand.nextLong(), 4, 0.25);
noiseGen2 = new Gradient(rand.nextLong(), 4, 0.25);
noiseGen3 = new Gradient(rand.nextLong(), 1, 0.25);
noiseGen4 = new Gradient(rand.nextLong(), 1, 0.25);
=======
this.noiseGen1 = new NoiseGeneratorOctaves(this.rand, 4);
this.noiseGen2 = new NoiseGeneratorOctaves(new Random(this.rand.nextLong()), 6);
this.noiseGen3 = new NoiseGeneratorOctaves(new Random(this.rand.nextLong()), 1);
this.noiseGen4 = new NoiseGeneratorOctaves(new Random(this.rand.nextLong()), 1);
>>>>>>>
noiseGen1 = new Gradient(rand.nextLong(), 4, 0.25);
noiseGen2 = new Gradient(rand.nextLong(), 4, 0.25);
noiseGen3 = new Gradient(rand.nextLong(), 1, 0.25);
noiseGen4 = new Gradient(rand.nextLong(), 1, 0.25);
<<<<<<<
noiseGen1.frequency = 0.0125;
noiseGen2.frequency = 0.015;
noiseGen3.frequency = 0.01;
noiseGen4.frequency = 0.02;
=======
this.noise1 = this.noiseGen1.generateNoiseOctaves(this.noise1, chunkX * GCMoonChunkProvider.CHUNK_SIZE_X, chunkZ * GCMoonChunkProvider.CHUNK_SIZE_Z, GCMoonChunkProvider.CHUNK_SIZE_X, GCMoonChunkProvider.CHUNK_SIZE_Z, 0.025D, 0.025D, 0.025D);
this.noise2 = this.noiseGen2.generateNoiseOctaves(this.noise2, chunkX * GCMoonChunkProvider.CHUNK_SIZE_X, chunkZ * GCMoonChunkProvider.CHUNK_SIZE_Z, GCMoonChunkProvider.CHUNK_SIZE_X, GCMoonChunkProvider.CHUNK_SIZE_Z, 0.07D, 0.07D, 0.07D);
this.noise3 = this.noiseGen3.generateNoiseOctaves(this.noise3, chunkX * GCMoonChunkProvider.CHUNK_SIZE_X, chunkZ * GCMoonChunkProvider.CHUNK_SIZE_Z, GCMoonChunkProvider.CHUNK_SIZE_X, GCMoonChunkProvider.CHUNK_SIZE_Z, 0.015D, 0.015D, 0.015D);
>>>>>>>
noiseGen1.frequency = 0.0125;
noiseGen2.frequency = 0.015;
noiseGen3.frequency = 0.01;
noiseGen4.frequency = 0.02;
<<<<<<<
double d = noiseGen1.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) * 8;
double d2 = noiseGen2.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) * 24;
double d3 = noiseGen3.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) - 0.1;
d3 *= 4;
=======
final double d = this.noise1[z + x * 16] * GCMoonChunkProvider.TERRAIN_HEIGHT_MOD;
final double d2 = Math.abs(this.noise2[z + x * 16] * GCMoonChunkProvider.HILL_HEIGHT_MOD);
final double d3 = this.noise3[z + x * 16] * GCMoonChunkProvider.HILL_FILTER_MOD;
>>>>>>>
double d = noiseGen1.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) * 8;
double d2 = noiseGen2.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) * 24;
double d3 = noiseGen3.getNoise((x + (chunkX * 16)), (z + (chunkZ * 16))) - 0.1;
d3 *= 4; |
<<<<<<<
if (entity.getRidingEntity() != null)
=======
Entity otherRiddenEntity = null;
if (entity.ridingEntity != null)
>>>>>>>
Entity otherRiddenEntity = null;
if (entity.getRidingEntity() != null)
<<<<<<<
player.closeScreen();
IStatsCapability stats = player.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
stats.setUsingPlanetSelectionGui(false);
=======
GCPlayerStats stats = GCPlayerStats.get(player);
stats.usingPlanetSelectionGui = false;
>>>>>>>
IStatsCapability stats = player.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
stats.setUsingPlanetSelectionGui(false);
<<<<<<<
worldOld.playerEntities.remove(player);
worldOld.updateAllPlayersSleepingFlag();
if (player.addedToChunk && worldOld.getChunkProvider().getLoadedChunk(player.chunkCoordX, player.chunkCoordZ) != null)
{
Chunk chunkOld = worldOld.getChunkFromChunkCoords(player.chunkCoordX, player.chunkCoordZ);
chunkOld.removeEntity(player);
chunkOld.setChunkModified();
}
worldOld.loadedEntityList.remove(player);
worldOld.onEntityRemoved(player);
if (worldNew.provider instanceof WorldProviderZeroGravity)
=======
removeEntityFromWorld(worldOld, player, true);
spawnPos = type.getPlayerSpawnLocation((WorldServer) worldNew, player);
if (worldNew.provider instanceof WorldProviderSpaceStation)
>>>>>>>
removeEntityFromWorld(worldOld, player, true);
spawnPos = type.getPlayerSpawnLocation((WorldServer) worldNew, player);
if (worldNew.provider instanceof WorldProviderSpaceStation)
<<<<<<<
spawnPos = type.getPlayerSpawnLocation((WorldServer) entity.worldObj, player);
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getChunkCoordIntPair();
=======
ChunkCoordIntPair pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getChunkCoordIntPair();
>>>>>>>
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getChunkCoordIntPair(); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderZeroGravity;
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsClientHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsClientCapability;
=======
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation;
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStatsClient;
>>>>>>>
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsClientHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsClientCapability;
import micdoodle8.mods.galacticraft.core.dimension.WorldProviderSpaceStation;
<<<<<<<
if (stats.getLandingTicks() > 0)
{
float sneakY;
if (stats.getLandingTicks() >= 4) sneakY = (stats.getLandingTicks() >= 5) ? 0.15F : 0.3F;
else
sneakY = stats.getLandingTicks() * 0.075F;
GL11.glTranslatef(sneakY * stats.getGdir().getSneakVecX(), sneakY * stats.getGdir().getSneakVecY(), sneakY * stats.getGdir().getSneakVecZ());
}
=======
// GL11.glTranslatef(sneakY * stats.gdir.getSneakVecX(), sneakY * stats.gdir.getSneakVecY(), sneakY * stats.gdir.getSneakVecZ());
>>>>>>>
// GL11.glTranslatef(sneakY * stats.gdir.getSneakVecX(), sneakY * stats.gdir.getSneakVecY(), sneakY * stats.gdir.getSneakVecZ()); |
<<<<<<<
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
=======
import net.minecraft.block.Block;
>>>>>>>
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.EntityEquipmentSlot;
import net.minecraft.block.Block; |
<<<<<<<
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.world.provider), new Object[] { stats.getBuildFlags() }), player);
=======
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.worldObj), stats.getMiscNetworkedStats() ), player);
>>>>>>>
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.world), stats.getMiscNetworkedStats() ), player);
<<<<<<<
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.world), new Object[] { stats.getBuildFlags() }), player);
=======
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.worldObj), stats.getMiscNetworkedStats() ), player);
>>>>>>>
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_STATS, GCCoreUtil.getDimensionID(player.world), stats.getMiscNetworkedStats() ), player); |
<<<<<<<
minecraft.theWorld.playSound(player, posX, posY, posZ, SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 1000.0F, 1.0F + player.getRNG().nextFloat() * 0.2F);
=======
minecraft.theWorld.playSound(posX, posY, posZ, "ambient.weather.thunder", 500.0F + player.getRNG().nextFloat() * 500F, 1.0F + player.getRNG().nextFloat() * 0.2F, false);
>>>>>>>
minecraft.theWorld.playSound(player, posX, posY, posZ, SoundEvents.ENTITY_LIGHTNING_THUNDER, SoundCategory.WEATHER, 500.0F + player.getRNG().nextFloat() * 500F, 1.0F + player.getRNG().nextFloat() * 0.2F); |
<<<<<<<
import net.minecraft.util.NonNullList;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.NonNullList;
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
@Override
public boolean isEmpty()
{
for (ItemStack itemstack : this.stackList)
{
if (!itemstack.isEmpty())
{
return false;
}
}
return true;
}
=======
>>>>>>>
@Override
public boolean isEmpty()
{
for (ItemStack itemstack : this.stackList)
{
if (!itemstack.isEmpty())
{
return false;
}
}
return true;
} |
<<<<<<<
import net.minecraft.init.SoundEvents;
=======
import net.minecraft.item.ItemStack;
>>>>>>>
import net.minecraft.init.SoundEvents;
import net.minecraft.item.ItemStack;
<<<<<<<
import net.minecraft.util.math.BlockPos;
=======
import net.minecraft.util.MovingObjectPosition;
>>>>>>>
import net.minecraft.util.MovingObjectPosition;
import net.minecraft.util.math.BlockPos;
<<<<<<<
=======
@Override
public ItemStack getPickedResult(MovingObjectPosition target)
{
return SchematicRegistry.getSchematicItem(this.schematic);
}
/**
* Sets the location and Yaw/Pitch of an entity in the world
*/
>>>>>>>
@Override
public ItemStack getPickedResult(MovingObjectPosition target)
{
return SchematicRegistry.getSchematicItem(this.schematic);
} |
<<<<<<<
case C_UPDATE_ARCLAMP_FACING:
tile = player.world.getTileEntity((BlockPos) this.data.get(0));
int facingNew = (Integer) this.data.get(1);
if (tile instanceof TileEntityArclamp)
{
((TileEntityArclamp) tile).facing = facingNew;
}
break;
=======
>>>>>>>
<<<<<<<
case C_UPDATE_VIEWSCREEN:
tile = player.world.getTileEntity((BlockPos) this.data.get(0));
if (tile instanceof TileEntityScreen)
{
TileEntityScreen screenTile = (TileEntityScreen) tile;
int screenType = (Integer) this.data.get(1);
int flags = (Integer) this.data.get(2);
screenTile.imageType = screenType;
screenTile.connectedUp = (flags & 8) != 0;
screenTile.connectedDown = (flags & 4) != 0;
screenTile.connectedLeft = (flags & 2) != 0;
screenTile.connectedRight = (flags & 1) != 0;
screenTile.refreshNextTick(true);
}
break;
=======
>>>>>>>
<<<<<<<
String name = (String) this.data.get(1);
if (name.startsWith("$"))
{
//It's a player name
((TileEntityTelemetry) tile).clientClass = EntityPlayerMP.class;
String strName = name.substring(1);
((TileEntityTelemetry) tile).clientName = strName;
GameProfile profile = FMLClientHandler.instance().getClientPlayerEntity().getGameProfile();
if (!strName.equals(profile.getName()))
{
profile = PlayerUtil.getOtherPlayerProfile(strName);
if (profile == null)
{
String strUUID = (String) this.data.get(7);
profile = PlayerUtil.makeOtherPlayerProfile(strName, strUUID);
}
if (!profile.getProperties().containsKey("textures"))
{
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(EnumSimplePacket.S_REQUEST_PLAYERSKIN, this.getDimensionID(), new Object[] { strName }));
}
}
((TileEntityTelemetry) tile).clientGameProfile = profile;
}
else
{
if (name.isEmpty())
{
((TileEntityTelemetry) tile).clientClass = null;
}
else
{
EntityEntry entityEntry = ForgeRegistries.ENTITIES.getValue(new ResourceLocation(name));
((TileEntityTelemetry) tile).clientClass = entityEntry == null ? null : entityEntry.getEntityClass();
}
}
((TileEntityTelemetry) tile).clientData = new int[5];
for (int i = 4; i < 7; i++)
{
((TileEntityTelemetry) tile).clientData[i - 4] = (Integer) this.data.get(i);
}
=======
((TileEntityTelemetry) tile).receiveUpdate(data, this.getDimensionID());
>>>>>>>
((TileEntityTelemetry) tile).receiveUpdate(data, this.getDimensionID());
<<<<<<<
case S_REQUEST_ARCLAMP_FACING:
TileEntity tileAL = player.world.getTileEntity((BlockPos) this.data.get(0));
if (tileAL instanceof TileEntityArclamp)
{
((TileEntityArclamp) tileAL).updateClientFlag = true;
}
break;
=======
>>>>>>>
<<<<<<<
case S_UPDATE_VIEWSCREEN_REQUEST:
TileEntity tile = player.world.getTileEntity((BlockPos) this.data.get(0));
if (tile instanceof TileEntityScreen)
{
((TileEntityScreen) tile).updateClients();
}
break;
=======
>>>>>>> |
<<<<<<<
primer.setBlockState(x, y, z, this.GRASS.getStateFromMeta(this.GRASS_META));
=======
primer.setBlockState(index, grassBlock);
>>>>>>>
primer.setBlockState(x, y, z, grassBlock);
<<<<<<<
primer.setBlockState(x, y, z, this.DIRT.getStateFromMeta(this.DIRT_META));
=======
primer.setBlockState(index, dirtBlock);
>>>>>>>
primer.setBlockState(x, y, z, dirtBlock);
<<<<<<<
primer.setBlockState(x, y, z, Blocks.AIR.getDefaultState());
// blockArray[index] = Blocks.AIR;
=======
primer.setBlockState(index, airBlock);
// blockArray[index] = Blocks.air;
>>>>>>>
primer.setBlockState(x, y, z, airBlock);
// blockArray[index] = Blocks.air;
<<<<<<<
primer.setBlockState(x, y, z, core.block.getStateFromMeta(core.meta));
=======
primer.setBlockState(index, asteroidCore);
>>>>>>>
primer.setBlockState(x, y, z, asteroidCore);
<<<<<<<
primer.setBlockState(x, y, z, this.ASTEROID_STONE.getStateFromMeta(this.ASTEROID_STONE_META_0));
=======
primer.setBlockState(index, asteroidRock0);
>>>>>>>
primer.setBlockState(x, y, z, asteroidRock0);
<<<<<<<
primer.setBlockState(x, y, z, shell.block.getStateFromMeta(shell.meta));
=======
primer.setBlockState(index, asteroidShell);
>>>>>>>
primer.setBlockState(x, y, z, asteroidShell);
<<<<<<<
primer.setBlockState(x, y, z, this.ASTEROID_STONE.getStateFromMeta(this.ASTEROID_STONE_META_1));
=======
primer.setBlockState(index, asteroidRock1);
>>>>>>>
primer.setBlockState(x, y, z, asteroidRock1); |
<<<<<<<
if (event.isWasDeath())
=======
if (event.wasDeath) //TODO: why only on death? we could copy the stats capability on all cloning events
>>>>>>>
if (event.isWasDeath()) //TODO: why only on death? we could copy the stats capability on all cloning events |
<<<<<<<
this.canBlockPassAirCheck(headState.getBlock(), this.head, EnumFacing.UP);
=======
this.canBlockPassAirCheck(headBlock, this.head, 1);
>>>>>>>
this.canBlockPassAirCheck(headState.getBlock(), this.head, 1);
<<<<<<<
// int metadata = 0;
// if (ambientThermal)
// {
// metadata = 1;
// }
// TODO Replace getDefaultState() below with thermal state if ambientThermal is true
=======
Block breatheableAirIDBright = GCBlocks.brightBreatheableAir;
int metadata = ambientThermal ? 1 : 0;
//TODO: Can we somehow detect only changes in state of ambientThermal since last check? tricky...
>>>>>>>
Block breatheableAirIDBright = GCBlocks.brightBreatheableAir;
int metadata = ambientThermal ? 1 : 0;
//TODO: Can we somehow detect only changes in state of ambientThermal since last check? tricky...
<<<<<<<
changeList.add(new ScheduledBlockChange(checkedVec.clone(), breatheableAirID.getStateFromMeta(ambientThermal ? 1 : 0), 0));
=======
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirID, metadata, 0));
>>>>>>>
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirID.getStateFromMeta(metadata), 0));
<<<<<<<
changeList.add(new ScheduledBlockChange(checkedVec.clone(), GCBlocks.brightBreatheableAir.getStateFromMeta(ambientThermal ? 1 : 0), 0));
=======
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirIDBright, metadata, 0));
>>>>>>>
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirIDBright.getStateFromMeta(metadata), 0));
<<<<<<<
changeList.add(new ScheduledBlockChange(checkedVec.clone(), checkedVec.getBlockState(world).getBlock().getStateFromMeta(ambientThermal ? 1 : 0), 0));
=======
if (checkedVec.getBlockMetadata(this.world) != metadata)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirID, metadata, 0));
}
}
for (BlockVec3 checkedVec : this.ambientThermalTrackedBright)
{
if (checkedVec.getBlockMetadata(this.world) != metadata)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirIDBright, metadata, 0));
}
>>>>>>>
if (checkedVec.getBlockMetadata(this.world) != metadata)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirID.getStateFromMeta(metadata), 0));
}
}
for (BlockVec3 checkedVec : this.ambientThermalTrackedBright)
{
if (checkedVec.getBlockMetadata(this.world) != metadata)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), breatheableAirIDBright.getStateFromMeta(metadata), 0));
}
<<<<<<<
changeList.add(new ScheduledBlockChange(checkedVec.clone(), Blocks.AIR.getDefaultState(), 0));
=======
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), Blocks.air, 0, 0));
}
for (BlockVec3 checkedVec : this.fireToReplace)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), Blocks.air, 0, 2));
>>>>>>>
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), Blocks.AIR.getDefaultState(), 0));
}
for (BlockVec3 checkedVec : this.fireToReplace)
{
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), Blocks.AIR.getDefaultState(), 2));
<<<<<<<
changeList.add(new ScheduledBlockChange(checkedVec.clone(), GCBlocks.brightAir.getDefaultState(), 0));
=======
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), GCBlocks.brightAir, 0, 0));
>>>>>>>
changeList.add(new ScheduledBlockChange(checkedVec.toBlockPos(), GCBlocks.brightAir.getDefaultState(), 0));
<<<<<<<
EnumFacing facing = state.getValue(BlockPistonBase.FACING);
=======
int facing = ((EnumFacing) state.getValue(BlockPistonBase.FACING)).getIndex();
>>>>>>>
int facing = ((EnumFacing) state.getValue(BlockPistonBase.FACING)).getIndex();
<<<<<<<
if (block.isSideSolid(state, this.world, new BlockPos(vec.x, vec.y, vec.z), side.getOpposite()))
=======
if (block.isSideSolid(this.world, new BlockPos(vec.x, vec.y, vec.z), EnumFacing.getFront(side ^ 1)))
>>>>>>>
if (block.isSideSolid(state, this.world, vec.toBlockPos(), EnumFacing.getFront(side ^ 1))) |
<<<<<<<
import com.cube.lush.player.handler.ResponseHandler;
import com.cube.lush.player.manager.MediaManager;
import com.cube.lush.player.model.RadioContent;
=======
import com.cube.lush.player.model.Channel;
>>>>>>>
import com.cube.lush.player.handler.ResponseHandler;
import com.cube.lush.player.manager.MediaManager;
import com.cube.lush.player.model.RadioContent;
import com.cube.lush.player.model.Channel;
<<<<<<<
private ArrayObjectAdapter tvAdapter;
private ArrayObjectAdapter radioAdapter;
=======
private Channel mChannel;
private ArrayObjectAdapter mMediaAdapter;
>>>>>>>
private Channel mChannel;
private ArrayObjectAdapter tvAdapter;
private ArrayObjectAdapter radioAdapter; |
<<<<<<<
EntityPlayer gearDataPlayer;
MinecraftServer server = player.world.getMinecraftServer();
=======
>>>>>>>
<<<<<<<
if (server != null)
{
gearDataPlayer = PlayerUtil.getPlayerForUsernameVanilla(server, gearName);
}
else
{
gearDataPlayer = player.world.getPlayerEntityByName(gearName);
}
=======
EntityPlayer gearDataPlayer = player.worldObj.getPlayerEntityByName(gearName);
>>>>>>>
EntityPlayer gearDataPlayer = player.world.getPlayerEntityByName(gearName);
<<<<<<<
EntityPlayerMP memberObj = PlayerUtil.getPlayerForUsernameVanilla(player.world.getMinecraftServer(), member);
=======
EntityPlayerMP memberObj = PlayerUtil.getPlayerForUsernameVanilla(server, member);
>>>>>>>
EntityPlayerMP memberObj = PlayerUtil.getPlayerForUsernameVanilla(server, member); |
<<<<<<<
world.setBlockState(new BlockPos(px, y, pz), block.getStateFromMeta(meta), 2);
int count = 7;
if (!(world.getBlockState(new BlockPos(px - 1, y, pz)).getBlock() instanceof BlockAir))
=======
worldObj.setBlockState(new BlockPos(px, y, pz), block.getStateFromMeta(meta), 2);
int count = 9;
if (!(worldObj.getBlockState(new BlockPos(px - 1, y, pz)).getBlock() instanceof BlockAir))
>>>>>>>
world.setBlockState(new BlockPos(px, y, pz), block.getStateFromMeta(meta), 2);
int count = 9;
if (!(world.getBlockState(new BlockPos(px - 1, y, pz)).getBlock() instanceof BlockAir))
<<<<<<<
world.setLightFor(EnumSkyBlock.BLOCK, new BlockPos(px, y, pz), count);
=======
worldObj.setLightFor(EnumSkyBlock.BLOCK, new BlockPos(px - (count > 1 ? 1 : 0), y, pz), count);
>>>>>>>
world.setLightFor(EnumSkyBlock.BLOCK, new BlockPos(px - (count > 1 ? 1 : 0), y, pz), count); |
<<<<<<<
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.BlockPos;
=======
>>>>>>>
import net.minecraft.util.BlockPos;
<<<<<<<
if (!this.worldObj.isRemote && this.getLandingPad() != null && this.getLandingPad().getConnectedTiles() != null)
{
for (ILandingPadAttachable tile : this.getLandingPad().getConnectedTiles())
{
if (this.worldObj.getTileEntity(((TileEntity) tile).getPos()) != null && this.worldObj.getTileEntity(((TileEntity) tile).getPos()) instanceof TileEntityFuelLoader)
{
if (tile instanceof TileEntityFuelLoader && ((TileEntityFuelLoader) tile).getEnergyStoredGC() > 0)
{
if (this.launchPhase == EnumLaunchPhase.LAUNCHED.ordinal())
{
this.setPad(null);
}
}
}
}
}
=======
>>>>>>> |
<<<<<<<
=======
import cpw.mods.fml.relauncher.Side;
import cpw.mods.fml.relauncher.SideOnly;
import micdoodle8.mods.galacticraft.api.event.ZeroGravityEvent;
>>>>>>>
import micdoodle8.mods.galacticraft.api.event.ZeroGravityEvent;
<<<<<<<
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
=======
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
{
return false;
}
ZeroGravityEvent zeroGEvent = new ZeroGravityEvent.InFreefall(p);
MinecraftForge.EVENT_BUS.post(zeroGEvent);
if (zeroGEvent.isCanceled())
{
return false;
}
if (stats.pjumpticks > 0 || (stats.pWasOnGround && p.movementInput.jump))
>>>>>>>
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
{
return false;
}
ZeroGravityEvent zeroGEvent = new ZeroGravityEvent.InFreefall(p);
MinecraftForge.EVENT_BUS.post(zeroGEvent);
if (zeroGEvent.isCanceled())
<<<<<<<
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
{
return;
}
boolean freefall = stats.isInFreefall();
freefall = this.testFreefall(p, freefall);
stats.setInFreefall(freefall);
stats.setInFreefallFirstCheck(true);
=======
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
{
return;
}
ZeroGravityEvent zeroGEvent = new ZeroGravityEvent.Motion(p);
MinecraftForge.EVENT_BUS.post(zeroGEvent);
if (zeroGEvent.isCanceled())
{
return;
}
boolean freefall = stats.inFreefall;
if (freefall) p.ySize = 0F; //Undo the sneak height adjust
freefall = testFreefall(p, freefall);
stats.inFreefall = freefall;
stats.inFreefallFirstCheck = true;
>>>>>>>
World world = p.worldObj;
WorldProvider worldProvider = world.provider;
if (!(worldProvider instanceof IZeroGDimension))
{
return;
}
ZeroGravityEvent zeroGEvent = new ZeroGravityEvent.Motion(p);
MinecraftForge.EVENT_BUS.post(zeroGEvent);
if (zeroGEvent.isCanceled())
{
return;
}
boolean freefall = stats.isInFreefall();
freefall = this.testFreefall(p, freefall);
stats.setInFreefall(freefall);
stats.setInFreefallFirstCheck(true); |
<<<<<<<
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.text.ITextComponent;
import net.minecraft.util.math.MathHelper;
=======
import net.minecraft.util.MathHelper;
>>>>>>>
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public boolean hasCustomName()
{
return false;
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
//
// if (isClient)
// {
// this.onEntityConstructingClient(event);
// }
// }
//
// @SideOnly(Side.CLIENT)
// public void onEntityConstructingClient(EntityEvent.EntityConstructing event)
// {
// if (event.getEntity() instanceof EntityPlayerSP)
// {
// if (GCPlayerStatsClient.get((EntityPlayerSP) event.getEntity()) == null)
=======
if (event.entity instanceof EntityPlayer && event.entity.worldObj.isRemote)
{
this.onEntityConstructingClient(event);
}
}
@SideOnly(Side.CLIENT)
public void onEntityConstructingClient(EntityEvent.EntityConstructing event)
{
if (event.entity instanceof EntityPlayerSP)
{
// if (GCPlayerStatsClient.get((EntityPlayerSP) event.entity) == null)
>>>>>>>
//
// if (event.entity instanceof EntityPlayer && event.entity.worldObj.isRemote)
// {
// this.onEntityConstructingClient(event);
// }
// }
//
// @SideOnly(Side.CLIENT)
// public void onEntityConstructingClient(EntityEvent.EntityConstructing event)
// {
// if (event.getEntity() instanceof EntityPlayerSP)
// {
// if (GCPlayerStatsClient.get((EntityPlayerSP) event.getEntity()) == null) |
<<<<<<<
import net.minecraft.util.math.ChunkPos;
import net.minecraft.util.text.ITextComponent;
=======
import net.minecraft.world.ChunkCoordIntPair;
>>>>>>>
import net.minecraft.util.math.ChunkPos;
<<<<<<<
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
=======
MainActivity.toast.setText(pokemonFound > 0 ? pokemonFound + " new catchable Pokemon have been found." : "No new Pokemon have been found.");
MainActivity.toast.show();
updatePokemonMarkers();
} else {
MainActivity.toast.setText("The map is not initialized.");
MainActivity.toast.show();
>>>>>>>
if(getView() != null) {
String text = pokemonFound > 0 ? pokemonFound + " new catchable Pokemon have been found." : "No new Pokemon have been found.";
Snackbar.make(getView(), text, Snackbar.LENGTH_SHORT).show();
}
updatePokemonMarkers();
<<<<<<<
Snackbar.make(getView(), "Found " + event.getCatchablePokemon().size() + " Pokemon", Snackbar.LENGTH_SHORT).show();
=======
>>>>>>>
Snackbar.make(getView(), "Found " + event.getCatchablePokemon().size() + " Pokemon", Snackbar.LENGTH_SHORT).show(); |
<<<<<<<
// if (from.equals(EnumFacing.getFront(this.getBlockMetadata() + 2).getOpposite()))
if (from.equals(this.world.getBlockState(getPos()).getValue(BlockFuelLoader.FACING)))
=======
if (this.getElectricInputDirection().getOpposite().equals(from))
>>>>>>>
// if (from.equals(EnumFacing.getFront(this.getBlockMetadata() + 2).getOpposite()))
if (from.equals(this.world.getBlockState(getPos()).getValue(BlockFuelLoader.FACING)))
<<<<<<<
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Nullable
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing)
{
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
{
return (T) new FluidHandlerWrapper(this, facing);
}
return super.getCapability(capability, facing);
}
=======
@Override
public boolean canConnect(EnumFacing direction, NetworkType type)
{
if (direction == null)
{
return false;
}
if (type == NetworkType.POWER)
{
return direction == this.getElectricInputDirection();
}
if (type == NetworkType.FLUID)
{
return direction == this.getElectricInputDirection().getOpposite();
}
return false;
}
>>>>>>>
@Override
public boolean hasCapability(Capability<?> capability, @Nullable EnumFacing facing)
{
return capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY || super.hasCapability(capability, facing);
}
@Nullable
@Override
public <T> T getCapability(Capability<T> capability, @Nullable EnumFacing facing)
{
if (capability == CapabilityFluidHandler.FLUID_HANDLER_CAPABILITY)
{
return (T) new FluidHandlerWrapper(this, facing);
}
return super.getCapability(capability, facing);
}
@Override
public boolean canConnect(EnumFacing direction, NetworkType type)
{
if (direction == null)
{
return false;
}
if (type == NetworkType.POWER)
{
return direction == this.getElectricInputDirection();
}
if (type == NetworkType.FLUID)
{
return direction == this.getElectricInputDirection().getOpposite();
}
return false;
} |
<<<<<<<
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
=======
import java.lang.reflect.Field;
import java.util.*;
>>>>>>>
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List; |
<<<<<<<
GL11.glPushMatrix();
final int i = OverlayRocket.minecraft.player.getRidingEntity().getBrightnessForRender(1);
=======
GlStateManager.pushMatrix();
final int i = OverlayRocket.minecraft.thePlayer.getRidingEntity().getBrightnessForRender(1);
>>>>>>>
GlStateManager.pushMatrix();
final int i = OverlayRocket.minecraft.player.getRidingEntity().getBrightnessForRender(1); |
<<<<<<<
import java.util.*;
=======
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
>>>>>>>
import java.util.*;
<<<<<<<
private static HashMap<NonNullList<ItemStack>, ItemStack> recipes = new HashMap<>();
=======
private static HashMap<Object[], ItemStack> recipes = new HashMap<>();
>>>>>>>
private static HashMap<NonNullList<Object>, ItemStack> recipes = new HashMap<>();
<<<<<<<
public static void addRecipe(ItemStack output, NonNullList<ItemStack> inputList)
=======
public static void addRecipe(ItemStack output, Object[] inputList)
>>>>>>>
public static void addRecipe(ItemStack output, NonNullList<Object> inputList)
<<<<<<<
ItemStack inputStack = inputList.get(i);
if (inputStack.isEmpty())
=======
Object input = inputList[i];
if (input instanceof ItemStack)
>>>>>>>
Object input = inputList.get(i);
if (input instanceof ItemStack)
<<<<<<<
for (Entry<NonNullList<ItemStack>, ItemStack> recipe : CircuitFabricatorRecipes.recipes.entrySet())
=======
for (Entry<Object[], ItemStack> recipe : CircuitFabricatorRecipes.recipes.entrySet())
>>>>>>>
for (Entry<NonNullList<Object>, ItemStack> recipe : CircuitFabricatorRecipes.recipes.entrySet())
<<<<<<<
ItemStack recipeStack = recipe.getKey().get(i);
ItemStack inputStack = inputList.get(i);
=======
Object recipeStack = recipe.getKey()[i];
ItemStack inputStack = inputList[i];
>>>>>>>
Object recipeStack = recipe.getKey().get(i);
ItemStack inputStack = inputList.get(i); |
<<<<<<<
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
<<<<<<<
public class TileEntityOxygenStorageModule extends TileEntityOxygen implements ISidedInventory
=======
public class TileEntityOxygenStorageModule extends TileEntityOxygen implements IInventoryDefaults, ISidedInventory, IFluidHandler
>>>>>>>
public class TileEntityOxygenStorageModule extends TileEntityOxygen implements IInventoryDefaults, ISidedInventory
<<<<<<<
@Override
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
=======
>>>>>>> |
<<<<<<<
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
=======
import net.minecraft.client.renderer.culling.ICamera;
>>>>>>>
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.culling.ICamera;
<<<<<<<
=======
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
>>>>>>> |
<<<<<<<
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
import micdoodle8.mods.galacticraft.core.tile.EnergyStorageTile;
=======
import micdoodle8.mods.galacticraft.core.energy.tile.EnergyStorageTile;
>>>>>>>
import micdoodle8.mods.galacticraft.core.energy.tile.EnergyStorageTile;
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc; |
<<<<<<<
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.air.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, chunkBox);
<<<<<<<
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.air.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, chunkBox); |
<<<<<<<
this.stacks = cargo;
=======
this.toAddToServer = true;
this.cargoItems = cargo.clone();
>>>>>>>
this.toAddToServer = true;
this.stacks = cargo;
<<<<<<<
TileEntity tileEntity = posBase.getTileEntity(this.world);
if (tileEntity instanceof TileEntityMinerBase && ((TileEntityMinerBase) tileEntity).isMaster && !tileEntity.isInvalid())
=======
if (posBase.blockExists(worldObj))
>>>>>>>
if (posBase.blockExists(this.world))
<<<<<<<
this.playerMP.sendMessage(new TextComponentString(GCCoreUtil.translate("gui.message.astro_miner" + FAIL_BASEDESTROYED + ".fail")));
this.givenFailMessage += (1 << FAIL_BASEDESTROYED);
//Continue mining even though base was destroyed - maybe it will be replaced
=======
if (this.playerMP != null && (this.givenFailMessage & (1 << FAIL_BASEDESTROYED)) == 0)
{
this.playerMP.addChatMessage(new TextComponentString(GCCoreUtil.translate("gui.message.astro_miner" + FAIL_BASEDESTROYED + ".fail")));
this.givenFailMessage += (1 << FAIL_BASEDESTROYED);
//Continue mining even though base was destroyed - maybe it will be replaced
}
>>>>>>>
if (this.playerMP != null && (this.givenFailMessage & (1 << FAIL_BASEDESTROYED)) == 0)
{
this.playerMP.sendMessage(new TextComponentString(GCCoreUtil.translate("gui.message.astro_miner" + FAIL_BASEDESTROYED + ".fail")));
this.givenFailMessage += (1 << FAIL_BASEDESTROYED);
//Continue mining even though base was destroyed - maybe it will be replaced
}
<<<<<<<
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
GalacticraftCore.packetPipeline.sendToDimension(new PacketDynamic(this), GCCoreUtil.getDimensionID(this.world));
=======
if (this.motionX != 0 || this.motionY != 0 || this.motionZ != 0)
{
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
GalacticraftCore.packetPipeline.sendToDimension(new PacketDynamic(this), GCCoreUtil.getDimensionID(this.worldObj));
}
>>>>>>>
if (this.motionX != 0 || this.motionY != 0 || this.motionZ != 0)
{
this.motionX = 0;
this.motionY = 0;
this.motionZ = 0;
GalacticraftCore.packetPipeline.sendToDimension(new PacketDynamic(this), GCCoreUtil.getDimensionID(this.world));
}
<<<<<<<
if (!this.world.isRemote && this.playerMP != null && !this.spawnedInCreative)
=======
if (!this.worldObj.isRemote && this.playerMP != null)
>>>>>>>
if (!this.world.isRemote && this.playerMP != null)
<<<<<<<
this.stacks = NonNullList.withSize(INV_SIZE, ItemStack.EMPTY);
ItemStackHelper.loadAllItems(nbt, this.stacks);
=======
final NBTTagList var2 = nbt.getTagList("Items", 10);
this.cargoItems = new ItemStack[this.INV_SIZE];
int itemCount = 0;
if (var2 != null)
{
for (int var3 = 0; var3 < var2.tagCount(); ++var3)
{
final NBTTagCompound var4 = var2.getCompoundTagAt(var3);
final int var5 = var4.getByte("Slot") & 255;
if (var5 < this.cargoItems.length)
{
ItemStack read = ItemStack.loadItemStackFromNBT(var4);
if (read != null)
{
this.cargoItems[var5] = read;
itemCount += read.stackSize;
}
}
}
}
this.mineCount = itemCount;
>>>>>>>
this.stacks = NonNullList.withSize(INV_SIZE, ItemStack.EMPTY);
ItemStackHelper.loadAllItems(nbt, this.stacks);
int itemCount = 0;
for (ItemStack stack : this.stacks)
{
itemCount += stack.getCount();
}
this.mineCount = itemCount; |
<<<<<<<
import net.minecraft.world.*;
import net.minecraft.world.chunk.Chunk;
=======
import net.minecraft.util.Vec3;
import net.minecraft.world.ChunkCoordIntPair;
import net.minecraft.world.EnumDifficulty;
import net.minecraft.world.World;
import net.minecraft.world.WorldProvider;
import net.minecraft.world.WorldServer;
import net.minecraft.world.WorldSettings;
import net.minecraft.world.WorldType;
import net.minecraft.world.chunk.IChunkProvider;
import net.minecraftforge.client.ForgeHooksClient;
>>>>>>>
import net.minecraft.world.*;
<<<<<<<
if (entity.ridingEntity instanceof EntitySpaceshipBase)
{
entity.mountEntity(entity.ridingEntity);
}
else if (entity.ridingEntity instanceof EntityCelestialFake)
{
entity.ridingEntity.setDead();
entity.mountEntity(null);
}
=======
if (entity.ridingEntity instanceof EntitySpaceshipBase)
entity.mountEntity(entity.ridingEntity);
else if (entity.ridingEntity instanceof EntityCelestialFake)
{
entity.ridingEntity.setDead();
entity.mountEntity(null);
}
else
{
otherRiddenEntity = entity.ridingEntity;
entity.mountEntity(null);
}
>>>>>>>
if (entity.ridingEntity instanceof EntitySpaceshipBase)
{
entity.mountEntity(entity.ridingEntity);
}
else if (entity.ridingEntity instanceof EntityCelestialFake)
{
entity.ridingEntity.setDead();
entity.mountEntity(null);
}
else
{
otherRiddenEntity = entity.ridingEntity;
entity.mountEntity(null);
}
<<<<<<<
((WorldServer) ridingRocket.worldObj).getEntityTracker().untrackEntity(ridingRocket);
ridingRocket.worldObj.loadedEntityList.remove(ridingRocket);
ridingRocket.worldObj.onEntityRemoved(ridingRocket);
=======
removeEntityFromWorld(ridingRocket.worldObj, ridingRocket, true);
>>>>>>>
((WorldServer) ridingRocket.worldObj).getEntityTracker().untrackEntity(ridingRocket);
removeEntityFromWorld(ridingRocket.worldObj, ridingRocket, true);
<<<<<<<
=======
/**
* What's important here is that Galacticraft and the server both register
* the same reachable Galacticraft planets (and their provider types) in the same order.
* See WorldUtil.registerPlanet().
*
* Even if there are dimension conflicts or other problems, the planets must be
* registered in the same order on both client and server. This should happen
* automatically if Galacticraft versions match, and if planets modules
* match (including Galacticraft-Planets and any other sub-mods).
*
* It is NOT a good idea for sub-mods to make the registration order of planets variable
* or dependent on configs.
*/
>>>>>>>
/**
* What's important here is that Galacticraft and the server both register
* the same reachable Galacticraft planets (and their provider types) in the same order.
* See WorldUtil.registerPlanet().
*
* Even if there are dimension conflicts or other problems, the planets must be
* registered in the same order on both client and server. This should happen
* automatically if Galacticraft versions match, and if planets modules
* match (including Galacticraft-Planets and any other sub-mods).
*
* It is NOT a good idea for sub-mods to make the registration order of planets variable
* or dependent on configs.
*/
<<<<<<<
//Start the provider index at offset 2 to skip the two Overworld Orbit dimensions
int providerIndex = GalaxyRegistry.getRegisteredSatellites().size() * 2;
=======
//Start the provider index at offset 2 to skip the two Overworld Orbit dimensions
//(this will be iterating through GalacticraftRegistry.worldProviderIDs)
int providerIndex = GalaxyRegistry.getRegisteredSatellites().size() * 2;
>>>>>>>
//Start the provider index at offset 2 to skip the two Overworld Orbit dimensions
//(this will be iterating through GalacticraftRegistry.worldProviderIDs)
int providerIndex = GalaxyRegistry.getRegisteredSatellites().size() * 2; |
<<<<<<<
//
// // TODO: for abitrary object
// public void globalAgentsInitialization(HashMap<P, ArrayList<T>> agents) {
//
// HashMap<P,ArrayList<T>>[] sendObjs = null;
//
// if(partition.getPid() == 0) {
// sendObjs = new HashMap[partition.numProcessors];
// for (P pos: agents.keySet()) {
// if (sendObjs[partition.toPartitionId(pos)] == null) {
// sendObjs[partition.toPartitionId(pos)] = new HashMap<P, ArrayList<T>>();
// }
// if(sendObjs[partition.toPartitionId(pos)].containsKey(pos)) {
// sendObjs[partition.toPartitionId(pos)].get(pos).addAll(agents.get(pos));
// }else {
// sendObjs[partition.toPartitionId(pos)].put(pos, new ArrayList<>(agents.get(pos)));
// }
// }
// }
// //System.out.println("sendbuf "+sendObjs);
// //System.out.println("a moment before Scatter");
// HashMap<P, ArrayList<T>> recvObject = null;
// try {
// recvObject = MPIUtil.scatter(MPI.COMM_WORLD, sendObjs, 0);
// }catch (Exception e) {
// // TODO: handle exception
// }
// //System.out.println("a moment after Scatter");
// for(P pos : recvObject.keySet()) {
// for (T t: recvObject.get(pos)) {
// if (t instanceof Stopping)
// addAgent(pos, t);
// else
// add(pos, t);
// }
// }
// }
//
// // TODO: for abitrary object
// public void globalRepeatingAgentsInitialization(HashMap<P, ArrayList<T>> agents) {
//
// HashMap<P,ArrayList<T>>[] sendObjs = null;
//
// if(partition.getPid() == 0) {
// sendObjs = new HashMap[partition.numProcessors];
// for (P pos: agents.keySet()) {
// if (sendObjs[partition.toPartitionId(pos)] == null) {
// sendObjs[partition.toPartitionId(pos)] = new HashMap<P, ArrayList<T>>();
// }
// if(sendObjs[partition.toPartitionId(pos)].containsKey(pos)) {
// sendObjs[partition.toPartitionId(pos)].get(pos).addAll(agents.get(pos));
// }else {
// sendObjs[partition.toPartitionId(pos)].put(pos, new ArrayList<T>(agents.get(pos)));
// }
// }
// }
// //System.out.println("sendbuf "+sendObjs);
// //System.out.println("a moment before Scatter");
// HashMap<P, ArrayList<T>> recvObject = null;
// try {
// recvObject = MPIUtil.scatter(MPI.COMM_WORLD, sendObjs, 0);
// }catch (Exception e) {
// // TODO: handle exception
// }
// //System.out.println("a moment after Scatter");
// for(P pos : recvObject.keySet()) {
// for (T t: recvObject.get(pos)) {
// if (t instanceof Stopping)
// addRepeatingAgent(pos, t, 1, 1);
// else
// add(pos,t);
// }
// }
// }
=======
>>>>>>>
<<<<<<<
// removeLocal(fromP, t);
=======
>>>>>>>
<<<<<<<
// addLocal(toP, t);
=======
>>>>>>>
<<<<<<<
// System.out.println(p);
=======
>>>>>>> |
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { " YV", "XWX", "XZX", 'V', Blocks.STONE_BUTTON, 'W', new ItemStack(GCItems.canister, 1, 0), 'X', platingTier3, 'Y', Items.FLINT_AND_STEEL, 'Z', GCItems.oxygenVent });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { "VY ", "XWX", "XZX", 'V', Blocks.STONE_BUTTON, 'W', new ItemStack(GCItems.canister, 1, 0), 'X', platingTier3, 'Y', Items.FLINT_AND_STEEL, 'Z', GCItems.oxygenVent });
=======
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { " YV", "XWX", "XZX", 'V', Blocks.stone_button, 'W', new ItemStack(GCItems.canister, 1, OreDictionary.WILDCARD_VALUE), 'X', platingTier3, 'Y', Items.flint_and_steel, 'Z', GCItems.oxygenVent });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { "VY ", "XWX", "XZX", 'V', Blocks.stone_button, 'W', new ItemStack(GCItems.canister, 1, OreDictionary.WILDCARD_VALUE), 'X', platingTier3, 'Y', Items.flint_and_steel, 'Z', GCItems.oxygenVent });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { " YV", "XWX", "XZX", 'V', Blocks.STONE_BUTTON, 'W', new ItemStack(GCItems.canister, 1, OreDictionary.WILDCARD_VALUE), 'X', platingTier3, 'Y', Items.FLINT_AND_STEEL, 'Z', GCItems.oxygenVent });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 1), new Object[] { "VY ", "XWX", "XZX", 'V', Blocks.STONE_BUTTON, 'W', new ItemStack(GCItems.canister, 1, OreDictionary.WILDCARD_VALUE), 'X', platingTier3, 'Y', Items.FLINT_AND_STEEL, 'Z', GCItems.oxygenVent }); |
<<<<<<<
import net.minecraft.world.gen.IChunkGenerator;
=======
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.biome.Biome;
>>>>>>>
import net.minecraft.world.gen.IChunkGenerator;
import net.minecraft.world.biome.Biome;
<<<<<<<
public static ThreadLocal<BufferBuilder> renderBuilder = new ThreadLocal<>();
=======
public static ThreadLocal<VertexBuffer> renderBuilder = new ThreadLocal<>();
private static int rainSoundCounter = 0;
>>>>>>>
public static ThreadLocal<BufferBuilder> renderBuilder = new ThreadLocal<>();
private static int rainSoundCounter = 0;
<<<<<<<
=======
public static void preInitFinal()
{
BlockGrating.remapForgeVariants();
}
@SideOnly(Side.CLIENT)
public static void addRainParticles(Random random, int rendererUpdateCount, float f)
{
Minecraft mc = Minecraft.getMinecraft();
random.setSeed((long)rendererUpdateCount * 312987231L);
Entity entity = mc.getRenderViewEntity();
World world = mc.world;
BlockPos blockpos = new BlockPos(entity);
int i = 10;
double x = 0.0D;
double y = 0.0D;
double z = 0.0D;
double xx = 0.0D;
double yy = 0.0D;
double zz = 0.0D;
int j = 0;
int k = (int)(100.0F * f * f);
if (mc.gameSettings.particleSetting == 1)
{
k >>= 1;
}
else if (mc.gameSettings.particleSetting == 2)
{
k = 0;
}
for (int l = 0; l < k; ++l)
{
BlockPos blockpos1 = world.getPrecipitationHeight(blockpos.add(random.nextInt(i) - random.nextInt(i), 0, random.nextInt(i) - random.nextInt(i)));
Biome biome = world.getBiome(blockpos1);
boolean canRain = biome.canRain() && biome.getFloatTemperature(blockpos1) >= 0.15F;
if (world.provider instanceof IWeatherProvider) canRain = true;
if (canRain && blockpos1.getY() <= blockpos.getY() + i && blockpos1.getY() >= blockpos.getY() - i)
{
double xd = random.nextDouble();
double zd = random.nextDouble();
BlockPos blockpos2 = blockpos1.down();
IBlockState iblockstate = world.getBlockState(blockpos2);
AxisAlignedBB axisalignedbb = iblockstate.getBoundingBox(world, blockpos2);
if (iblockstate.getMaterial() != Material.LAVA && iblockstate.getBlock() != Blocks.MAGMA)
{
if (iblockstate.getMaterial() != Material.AIR)
{
++j;
x = blockpos2.getX() + xd;
y = blockpos2.getY() + 0.1D + axisalignedbb.maxY;
z = blockpos2.getZ() + zd;
if (random.nextInt(j) == 0)
{
xx = x;
yy = y - 1.0D;
zz = z;
}
if (world.provider instanceof IWeatherProvider)
{
mc.effectRenderer.addEffect(((IWeatherProvider) world.provider).getParticle(mc.world, x, y, z));
}
else
{
mc.world.spawnParticle(EnumParticleTypes.WATER_DROP, x, y, z, 0.0D, 0.0D, 0.0D, new int[0]);
}
}
}
else
{
mc.world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, blockpos1.getX() + xd, blockpos1.getY() + 0.1D - axisalignedbb.minY, blockpos1.getZ() + zd, 0.0D, 0.0D, 0.0D, new int[0]);
}
}
}
if (j > 0 && random.nextInt((world.provider instanceof IWeatherProvider) ? ((IWeatherProvider) world.provider).getSoundInterval(f) : 3) < rainSoundCounter++)
{
rainSoundCounter = 0;
if (world.provider instanceof IWeatherProvider)
{
((IWeatherProvider) world.provider).weatherSounds(j, mc, world, blockpos, xx, yy, zz, random);
}
else
{
if ((int)yy >= blockpos.getY() + 1 && world.getPrecipitationHeight(blockpos).getY() > blockpos.getY())
{
mc.world.playSound(xx, yy, zz, SoundEvents.WEATHER_RAIN_ABOVE, SoundCategory.WEATHER, 0.1F, 0.5F, false);
}
else
{
mc.world.playSound(xx, yy, zz, SoundEvents.WEATHER_RAIN, SoundCategory.WEATHER, 0.2F, 1.0F, false);
}
}
}
}
>>>>>>>
@SideOnly(Side.CLIENT)
public static void addRainParticles(Random random, int rendererUpdateCount, float f)
{
Minecraft mc = Minecraft.getMinecraft();
random.setSeed((long)rendererUpdateCount * 312987231L);
Entity entity = mc.getRenderViewEntity();
World world = mc.world;
BlockPos blockpos = new BlockPos(entity);
int i = 10;
double x = 0.0D;
double y = 0.0D;
double z = 0.0D;
double xx = 0.0D;
double yy = 0.0D;
double zz = 0.0D;
int j = 0;
int k = (int)(100.0F * f * f);
if (mc.gameSettings.particleSetting == 1)
{
k >>= 1;
}
else if (mc.gameSettings.particleSetting == 2)
{
k = 0;
}
for (int l = 0; l < k; ++l)
{
BlockPos blockpos1 = world.getPrecipitationHeight(blockpos.add(random.nextInt(i) - random.nextInt(i), 0, random.nextInt(i) - random.nextInt(i)));
Biome biome = world.getBiome(blockpos1);
boolean canRain = biome.canRain() && biome.getTemperature(blockpos1) >= 0.15F;
if (world.provider instanceof IWeatherProvider) canRain = true;
if (canRain && blockpos1.getY() <= blockpos.getY() + i && blockpos1.getY() >= blockpos.getY() - i)
{
double xd = random.nextDouble();
double zd = random.nextDouble();
BlockPos blockpos2 = blockpos1.down();
IBlockState iblockstate = world.getBlockState(blockpos2);
AxisAlignedBB axisalignedbb = iblockstate.getBoundingBox(world, blockpos2);
if (iblockstate.getMaterial() != Material.LAVA && iblockstate.getBlock() != Blocks.MAGMA)
{
if (iblockstate.getMaterial() != Material.AIR)
{
++j;
x = blockpos2.getX() + xd;
y = blockpos2.getY() + 0.1D + axisalignedbb.maxY;
z = blockpos2.getZ() + zd;
if (random.nextInt(j) == 0)
{
xx = x;
yy = y - 1.0D;
zz = z;
}
if (world.provider instanceof IWeatherProvider)
{
mc.effectRenderer.addEffect(((IWeatherProvider) world.provider).getParticle(mc.world, x, y, z));
}
else
{
mc.world.spawnParticle(EnumParticleTypes.WATER_DROP, x, y, z, 0.0D, 0.0D, 0.0D, new int[0]);
}
}
}
else
{
mc.world.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, blockpos1.getX() + xd, blockpos1.getY() + 0.1D - axisalignedbb.minY, blockpos1.getZ() + zd, 0.0D, 0.0D, 0.0D, new int[0]);
}
}
}
if (j > 0 && random.nextInt((world.provider instanceof IWeatherProvider) ? ((IWeatherProvider) world.provider).getSoundInterval(f) : 3) < rainSoundCounter++)
{
rainSoundCounter = 0;
if (world.provider instanceof IWeatherProvider)
{
((IWeatherProvider) world.provider).weatherSounds(j, mc, world, blockpos, xx, yy, zz, random);
}
else
{
if ((int)yy >= blockpos.getY() + 1 && world.getPrecipitationHeight(blockpos).getY() > blockpos.getY())
{
mc.world.playSound(xx, yy, zz, SoundEvents.WEATHER_RAIN_ABOVE, SoundCategory.WEATHER, 0.1F, 0.5F, false);
}
else
{
mc.world.playSound(xx, yy, zz, SoundEvents.WEATHER_RAIN, SoundCategory.WEATHER, 0.2F, 1.0F, false);
}
}
}
} |
<<<<<<<
import net.minecraft.util.math.BlockPos;
=======
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
>>>>>>>
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.math.BlockPos; |
<<<<<<<
=======
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.particle.EntityFX;
>>>>>>>
import net.minecraft.client.multiplayer.WorldClient; |
<<<<<<<
public Block changeState()
{
if (this.lit)
{
return this.litVersion;
}
else
{
return this.unlitVersion;
}
}
=======
>>>>>>>
<<<<<<<
private boolean canPlaceTorchOn(World world, BlockPos pos)
{
IBlockState state = world.getBlockState(pos);
if (state.getBlock().isSideSolid(state, world, pos, EnumFacing.UP))
{
return true;
}
else
{
return world.getBlockState(pos).getBlock().canPlaceTorchOnTop(state, world, pos);
}
}
=======
>>>>>>>
<<<<<<<
private boolean canPlaceAt(World worldIn, BlockPos pos, EnumFacing facing)
{
BlockPos blockpos = pos.offset(facing.getOpposite());
boolean flag = facing.getAxis().isHorizontal();
return flag && worldIn.isSideSolid(blockpos, facing, true) || facing.equals(EnumFacing.UP) && this.canPlaceOn(worldIn, blockpos);
}
private boolean canPlaceOn(World worldIn, BlockPos pos)
{
IBlockState state = worldIn.getBlockState(pos);
if (state.getBlock().isSideSolid(state, worldIn, pos, EnumFacing.UP))
{
return true;
}
else
{
Block block = worldIn.getBlockState(pos).getBlock();
return block.canPlaceTorchOnTop(state, worldIn, pos);
}
}
@Override
public IBlockState onBlockPlaced(World worldIn, BlockPos pos, EnumFacing facing, float hitX, float hitY, float hitZ, int meta, EntityLivingBase placer)
{
if (this.canPlaceAt(worldIn, pos, facing))
{
return this.getDefaultState().withProperty(FACING, facing);
}
else
{
for (EnumFacing enumfacing : EnumFacing.Plane.HORIZONTAL)
{
if (worldIn.isSideSolid(pos.offset(enumfacing.getOpposite()), enumfacing, true))
{
return this.getDefaultState().withProperty(FACING, enumfacing);
}
}
return this.getDefaultState();
}
}
protected boolean checkForDrop(World worldIn, BlockPos pos, IBlockState state)
{
if (state.getBlock() == this && this.canPlaceAt(worldIn, pos, (EnumFacing) state.getValue(FACING)))
{
return true;
}
else
{
if (worldIn.getBlockState(pos).getBlock() == this)
{
this.dropBlockAsItem(worldIn, pos, state, 0);
worldIn.setBlockToAir(pos);
}
return false;
}
}
=======
>>>>>>>
<<<<<<<
@Override
public void randomDisplayTick(IBlockState stateIn, World worldIn, BlockPos pos, Random rand)
=======
public void randomDisplayTick(World worldIn, BlockPos pos, IBlockState state, Random par5Random)
>>>>>>>
@Override
public void randomDisplayTick(IBlockState stateIn, World worldIn, BlockPos pos, Random rand)
<<<<<<<
public IBlockState getStateFromMeta(int meta)
{
IBlockState iblockstate = this.getDefaultState();
switch (meta)
{
case 1:
iblockstate = iblockstate.withProperty(FACING, EnumFacing.EAST);
break;
case 2:
iblockstate = iblockstate.withProperty(FACING, EnumFacing.WEST);
break;
case 3:
iblockstate = iblockstate.withProperty(FACING, EnumFacing.SOUTH);
break;
case 4:
iblockstate = iblockstate.withProperty(FACING, EnumFacing.NORTH);
break;
case 5:
default:
iblockstate = iblockstate.withProperty(FACING, EnumFacing.UP);
}
return iblockstate;
}
@Override
public int getMetaFromState(IBlockState state)
{
int i = 0;
switch ((EnumFacing) state.getValue(FACING))
{
case EAST:
i = i | 1;
break;
case WEST:
i = i | 2;
break;
case SOUTH:
i = i | 3;
break;
case NORTH:
i = i | 4;
break;
case DOWN:
case UP:
default:
i = i | 5;
}
return i;
}
@Override
protected BlockStateContainer createBlockState()
=======
protected BlockState createBlockState()
>>>>>>>
protected BlockStateContainer createBlockState() |
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.sounds.GCSounds;
=======
import micdoodle8.mods.galacticraft.core.client.sounds.MusicTickerGC;
>>>>>>>
import micdoodle8.mods.galacticraft.core.client.sounds.GCSounds;
import micdoodle8.mods.galacticraft.core.client.sounds.MusicTickerGC;
<<<<<<<
((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this);
=======
try {
Field ftc = Minecraft.getMinecraft().getClass().getDeclaredField(GCCoreUtil.isDeobfuscated() ? "mcMusicTicker" : "field_147126_aw");
ftc.setAccessible(true);
ftc.set(Minecraft.getMinecraft(), new MusicTickerGC(Minecraft.getMinecraft()));
} catch (Exception e) {e.printStackTrace();}
>>>>>>>
((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this);
try {
Field ftc = Minecraft.getMinecraft().getClass().getDeclaredField(GCCoreUtil.isDeobfuscated() ? "mcMusicTicker" : "field_147126_aw");
ftc.setAccessible(true);
ftc.set(Minecraft.getMinecraft(), new MusicTickerGC(Minecraft.getMinecraft()));
} catch (Exception e) {e.printStackTrace();} |
<<<<<<<
try {
try {
MPI.COMM_WORLD.barrier();
} catch (MPIException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// Wait for all nodes that end the steps, before writing the objects buffer, we
// need
// that all processors have been finished the step in order to be sure that no
// processors
// invoke methods on remote objects in the distributed registry.
if (schedule.getSteps() > 0) {
if (schedule.getSteps() % 50 == 0) {
balancePartitions(balancerLevel);
if (balancerLevel != 0) {
balancerLevel--;
} else {
balancerLevel = ((QuadTreePartition) partition).getQt().getDepth() - 1;
}
}
}
try {
MPI.COMM_WORLD.barrier();
} catch (MPIException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
=======
try {
MPI.COMM_WORLD.barrier();
>>>>>>>
try {
MPI.COMM_WORLD.barrier();
<<<<<<<
// All nodes have finished the synchronization and can unregister exported
// objects.
try {
MPI.COMM_WORLD.barrier();
} catch (MPIException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
// After the synchronization we can unregister migrated object!
// remove exported-migrated object from local node
for (String mo : DRegistry.getInstance().getMigratedNames()) {
=======
//All nodes have finished the synchronization and can unregister exported objects.
MPI.COMM_WORLD.barrier();
//After the synchronization we can unregister migrated object!
//remove exported-migrated object from local node
for(String mo : DRegistry.getInstance().getMigratedNames()) {
>>>>>>>
//All nodes have finished the synchronization and can unregister exported objects.
MPI.COMM_WORLD.barrier();
//After the synchronization we can unregister migrated object!
//remove exported-migrated object from local node
for(String mo : DRegistry.getInstance().getMigratedNames()) {
<<<<<<<
System.out.println("PID " + partition.getPid() + " Sync object " + payloadWrapper.payload);
((Synchronizable) fieldRegistry.get(payloadWrapper.fieldIndex)).syncObject(payloadWrapper); // add the
// object to
// the field
}
if (payloadWrapper.payload instanceof DistributedIterativeRepeat) {
final DistributedIterativeRepeat iterativeRepeat = (DistributedIterativeRepeat) payloadWrapper.payload;
=======
((Synchronizable) fieldRegistry.get(payloadWrapper.fieldIndex)).
syncObject(payloadWrapper); // add the object to the field
}
if (payloadWrapper.payload instanceof IterativeRepeat) {
final IterativeRepeat iterativeRepeat = (IterativeRepeat) payloadWrapper.payload;
>>>>>>>
((Synchronizable) fieldRegistry.get(payloadWrapper.fieldIndex)).
syncObject(payloadWrapper); // add the object to the field
}
if (payloadWrapper.payload instanceof DistributedIterativeRepeat) {
final DistributedIterativeRepeat iterativeRepeat = (DistributedIterativeRepeat) payloadWrapper.payload;
<<<<<<<
// TODO: Check for Type Cast here
Stopping stopping = (Stopping) iterativeRepeat.step;
stopping.setStoppable(schedule.scheduleRepeating(stopping, iterativeRepeat.getOrdering(),
iterativeRepeat.interval));
// Add agent to the field
// addToField(iterativeRepeat.step, payloadWrapper.loc,
// payloadWrapper.fieldIndex);
=======
schedule.scheduleRepeating(iterativeRepeat.step, iterativeRepeat.getOrdering(),
iterativeRepeat.interval);
>>>>>>>
// TODO: Check for Type Cast here
Stopping stopping = (Stopping) iterativeRepeat.step;
stopping.setStoppable(schedule.scheduleRepeating(stopping, iterativeRepeat.getOrdering(),
iterativeRepeat.interval));
// Add agent to the field
// addToField(iterativeRepeat.step, payloadWrapper.loc,
// payloadWrapper.fieldIndex);
<<<<<<<
=======
>>>>>>>
<<<<<<<
private void balancePartitions(int level) {
// TODO Auto-generated method stub
try {
// System.out.println(((HaloGrid2D) fieldRegistry.get(0)).getStorage());
final IntHyperRect old_partition = partition.getPartition();
final int old_pid = partition.getPid();
final Double runtime = Timing.get(Timing.LB_RUNTIME).getMovingAverage();
Timing.start(Timing.LB_OVERHEAD);
System.out.println("before partitioning " + partition);
((QuadTreePartition) partition).balance(runtime, level);
MPI.COMM_WORLD.barrier();
System.out.println("after partitioning " + partition);
ArrayList<Object> migratedAgents = new ArrayList<>();
for (IntPoint p : old_partition) {
if (!partition.getPartition().contains(p)) {
final int toP = partition.toPartitionId(p);
for (Synchronizable field : fieldRegistry) {
if (((HaloGrid2D) field).getStorage() instanceof ContStorage) {
ContStorage st = (ContStorage) ((HaloGrid2D) field).getStorage();
HashSet agents = st.getCell(p);
for (Object a : agents) {
if (a instanceof Stopping && !migratedAgents.contains(a)) {
System.out.println(st);
System.out.println(" step " + schedule.getSteps() + " pid " + partition.getPid()
+ " position " + p + "cell " + st.discretize(p) + " in cell "
+ st.getCell(p) + " move to " + toP);
NdPoint loc = st.getLocation((Serializable) a);
st.removeObject((Serializable) a);
migrateAgent((Stopping) a, toP, loc, ((HaloGrid2D) field).fieldIndex);
System.out.println(" pid " + partition.getPid() + ": " + a + " moved ");
migratedAgents.add(a);
}
}
} else if (((HaloGrid2D) field).getStorage() instanceof ObjectGridStorage) {
ObjectGridStorage st = (ObjectGridStorage) ((HaloGrid2D) field).getStorage();
if (st.getObjects(p) != null) {
ArrayList<Stopping> agents = st.getObjects(p);
for (int i = 0; i < agents.size(); i++) {
System.out.println("balancing agent migration " + agents.get(i));
migrateAgent(agents.get(i), toP, p, ((HaloGrid2D) field).fieldIndex);
}
}
}
}
}
}
MPI.COMM_WORLD.barrier();
} catch (final Exception e) {
e.printStackTrace();
System.exit(-1);
}
Timing.stop(Timing.LB_OVERHEAD);
}
private void migrateAgent(Steppable agent, int dst, NdPoint p, int fieldIndex) {
if (agent instanceof Steppable) {
if (agent instanceof Stopping) {
Stoppable stop = ((Stopping) agent).getStoppable();
if (stop != null) {
if (stop instanceof DistributedTentativeStep) {
// System.out.println("stopping agent "+ stop);
stop.stop();
// AgentWrapper wrap = new AgentWrapper((Stopping) agent);
transporter.migrateAgent((Stopping) agent, dst, p, fieldIndex);
if (withRegistry)
DRegistry.getInstance().addMigratedName(agent);
} else if (stop instanceof DistributedIterativeRepeat) {
// System.out.println("stopping agent "+ stop);
stop.stop();
transporter.migrateRepeatingAgent((DistributedIterativeRepeat) agent, dst);
if (withRegistry)
DRegistry.getInstance().addMigratedName(agent);
} else
throw new RuntimeException(
"Stopping was not a DistributedTentativeStep or DistributedRepeat. It was a "
+ (stop.getClass()) + ".");
} else
throw new RuntimeException("agents: " + agent + " Stopping has null Steppable.");
} else
throw new RuntimeException("All Steppables that migrate must be Stopping.");
}
}
=======
>>>>>>> |
<<<<<<<
import micdoodle8.mods.galacticraft.core.blocks.BlockFallenMeteor;
=======
import micdoodle8.mods.galacticraft.core.blocks.BlockOxygenDetector;
>>>>>>>
import micdoodle8.mods.galacticraft.core.blocks.BlockFallenMeteor;
import micdoodle8.mods.galacticraft.core.blocks.BlockOxygenDetector;
<<<<<<<
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
=======
import net.minecraft.client.renderer.block.statemap.StateMap;
>>>>>>>
import net.minecraft.client.renderer.block.model.ModelBakery;
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.block.statemap.StateMap; |
<<<<<<<
this.checkOxygen(worldIn, pos);
=======
this.checkOxygen(worldIn, pos, state);
return false;
>>>>>>>
this.checkOxygen(worldIn, pos, state);
<<<<<<<
=======
@Override
public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
{
EnumFacing enumfacing = worldIn.getBlockState(pos).getValue(FACING);
float f = 0.15F;
if (enumfacing == EnumFacing.EAST)
{
this.setBlockBounds(0.0F, 0.2F, 0.5F - f, f * 2.0F, 0.8F, 0.5F + f);
}
else if (enumfacing == EnumFacing.WEST)
{
this.setBlockBounds(1.0F - f * 2.0F, 0.2F, 0.5F - f, 1.0F, 0.8F, 0.5F + f);
}
else if (enumfacing == EnumFacing.SOUTH)
{
this.setBlockBounds(0.5F - f, 0.2F, 0.0F, 0.5F + f, 0.8F, f * 2.0F);
}
else if (enumfacing == EnumFacing.NORTH)
{
this.setBlockBounds(0.5F - f, 0.2F, 1.0F - f * 2.0F, 0.5F + f, 0.8F, 1.0F);
}
else
{
f = 0.1F;
this.setBlockBounds(0.5F - f, 0.0F, 0.5F - f, 0.5F + f, 0.6F, 0.5F + f);
}
return super.collisionRayTrace(worldIn, pos, start, end);
}
@Override
>>>>>>> |
<<<<<<<
ItemStack var2 = ItemStack.EMPTY;
Slot var3 = this.inventorySlots.get(par1);
=======
ItemStack var2 = null;
Slot var3 = (Slot) this.inventorySlots.get(par1);
int off = this.tileEntity.tierGC == 2 ? 1 : 0;
>>>>>>>
ItemStack var2 = ItemStack.EMPTY;
Slot var3 = this.inventorySlots.get(par1);
int off = this.tileEntity.tierGC == 2 ? 1 : 0; |
<<<<<<<
if ((ConfigManagerCore.challengeMode || ConfigManagerCore.challengeSpawnHandling) && stats.getUnlockedSchematics().size() == 0)
=======
if ((ConfigManagerCore.challengeSpawnHandling) && GCPlayer.unlockedSchematics.size() == 0)
>>>>>>>
if ((ConfigManagerCore.challengeSpawnHandling) && stats.getUnlockedSchematics().size() == 0) |
<<<<<<<
import net.minecraft.util.ResourceLocation;
=======
import net.minecraft.tileentity.TileEntity;
>>>>>>>
import net.minecraft.util.ResourceLocation;
import net.minecraft.tileentity.TileEntity;
<<<<<<<
=======
public static int getDimensionID(TileEntity tileEntity)
{
return tileEntity.getWorld().provider.getDimension();
}
// public static void sortBlock(Block block, int meta, StackSorted beforeStack)
// {
// StackSorted newStack = new StackSorted(Item.getItemFromBlock(block), meta);
//
// // Remove duplicates
// for (Iterator<StackSorted> it = GalacticraftCore.itemOrderListBlocks.iterator(); it.hasNext();)
// {
// StackSorted stack = it.next();
// if (stack.equals(newStack))
// {
// it.remove();
// }
// }
//
// if (beforeStack == null)
// {
// GalacticraftCore.itemOrderListBlocks.add(newStack);
// }
// else
// {
// for (int i = 0; i < GalacticraftCore.itemOrderListBlocks.size(); ++i)
// {
// if (GalacticraftCore.itemOrderListBlocks.get(i).equals(beforeStack))
// {
// GalacticraftCore.itemOrderListBlocks.add(i + 1, newStack);
// return;
// }
// }
//
// throw new RuntimeException("Could not find block to insert before: " + beforeStack);
// }
// }
//
// public static void sortItem(Item item, int meta, StackSorted beforeStack)
// {
// StackSorted newStack = new StackSorted(item, meta);
//
// // Remove duplicates
// for (Iterator<StackSorted> it = GalacticraftCore.itemOrderListBlocks.iterator(); it.hasNext();)
// {
// StackSorted stack = it.next();
// if (stack.equals(newStack))
// {
// it.remove();
// }
// }
//
// if (beforeStack == null)
// {
// GalacticraftCore.itemOrderListItems.add(newStack);
// }
// else
// {
// for (int i = 0; i < GalacticraftCore.itemOrderListItems.size(); ++i)
// {
// if (GalacticraftCore.itemOrderListItems.get(i).equals(beforeStack))
// {
// GalacticraftCore.itemOrderListItems.add(i + 1, newStack);
// break;
// }
// }
// }
// }
>>>>>>>
public static int getDimensionID(TileEntity tileEntity)
{
return tileEntity.getWorld().provider.getDimension();
} |
<<<<<<<
=======
import micdoodle8.mods.galacticraft.core.blocks.GCBlocks;
import micdoodle8.mods.galacticraft.core.items.GCItems;
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
>>>>>>>
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
<<<<<<<
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 3), new ItemStack(GCItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 5), new ItemStack(Items.iron_ingot), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 3), new ItemStack(Items.iron_ingot), 0.5F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.5F);
=======
Object titaniumIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals ? new ItemStack(AsteroidsItems.basicItem, 1, 5) : "ingotTitanium";
Object titaniumPlate = ConfigManagerCore.recipesRequireGCAdvancedMetals ? new ItemStack(AsteroidsItems.basicItem, 1, 6) : "compressedTitanium";
FurnaceRecipes.smelting().func_151394_a(new ItemStack(AsteroidBlocks.blockBasic, 1, 3), new ItemStack(GCItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(AsteroidBlocks.blockBasic, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(AsteroidBlocks.blockBasic, 1, 5), new ItemStack(Items.iron_ingot), 0.0F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(AsteroidsItems.basicItem, 1, 3), new ItemStack(Items.iron_ingot), 0.5F);
FurnaceRecipes.smelting().func_151394_a(new ItemStack(AsteroidsItems.basicItem, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.5F);
>>>>>>>
Object titaniumIngot = ConfigManagerCore.recipesRequireGCAdvancedMetals ? new ItemStack(AsteroidsItems.basicItem, 1, 5) : "ingotTitanium";
Object titaniumPlate = ConfigManagerCore.recipesRequireGCAdvancedMetals ? new ItemStack(AsteroidsItems.basicItem, 1, 6) : "compressedTitanium";
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 3), new ItemStack(GCItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidBlocks.blockBasic, 1, 5), new ItemStack(Items.iron_ingot), 0.0F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 3), new ItemStack(Items.iron_ingot), 0.5F);
FurnaceRecipes.instance().addSmeltingRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 4), new ItemStack(AsteroidsItems.basicItem, 1, 5), 0.5F);
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 0), new Object[] { "XXX", " X ", 'X', new ItemStack(AsteroidsItems.basicItem, 1, 6) });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 1), new Object[] { "XXX", "YXY", "YYY", 'X', new ItemStack(AsteroidsItems.basicItem, 1, 6), 'Y', new ItemStack(GCBlocks.aluminumWire, 1, 1) });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 2), new Object[] { "XXX", "YXY", "YYY", 'X', new ItemStack(AsteroidsItems.basicItem, 1, 6), 'Y', new ItemStack(GCBlocks.oxygenPipe) });
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 1, 1), new ItemStack(AsteroidBlocks.blockWalkway, 1, 0), new ItemStack(GCBlocks.aluminumWire, 1, 1));
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 1, 2), new ItemStack(AsteroidBlocks.blockWalkway, 1, 0), new ItemStack(GCBlocks.oxygenPipe, 1));
=======
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5), new Object[] { "XXX", " X ", 'X', titaniumPlate });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkwayWire, 5), new Object[] { "XXX", "YXY", "YYY", 'X', titaniumPlate, 'Y', new ItemStack(GCBlocks.aluminumWire, 1, 1) });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkwayOxygenPipe, 5), new Object[] { "XXX", "YXY", "YYY", 'X', titaniumPlate, 'Y', new ItemStack(GCBlocks.oxygenPipe) });
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkwayWire, 1), new ItemStack(AsteroidBlocks.blockWalkway, 1), new ItemStack(GCBlocks.aluminumWire, 1, 1));
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkwayOxygenPipe, 1), new ItemStack(AsteroidBlocks.blockWalkway, 1), new ItemStack(GCBlocks.oxygenPipe, 1));
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 0), new Object[] { "XXX", " X ", 'X', titaniumPlate });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 1), new Object[] { "XXX", "YXY", "YYY", 'X', titaniumPlate, 'Y', new ItemStack(GCBlocks.aluminumWire, 1, 1) });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 5, 2), new Object[] { "XXX", "YXY", "YYY", 'X', titaniumPlate, 'Y', new ItemStack(GCBlocks.oxygenPipe) });
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 1, 1), new ItemStack(AsteroidBlocks.blockWalkway, 1), new ItemStack(GCBlocks.aluminumWire, 1, 1));
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(AsteroidBlocks.blockWalkway, 1, 2), new ItemStack(AsteroidBlocks.blockWalkway, 1), new ItemStack(GCBlocks.oxygenPipe, 1));
<<<<<<<
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 0), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 1), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 2), new ItemStack(Items.coal, 1, 1));
//Splintered ice into Ice
CompressorRecipes.addShapelessRecipe(new ItemStack(Blocks.ice), new ItemStack(AsteroidBlocks.blockDenseIce), new ItemStack(AsteroidBlocks.blockDenseIce));
//Slimeball
RecipeUtil.addRecipe(new ItemStack(Items.slime_ball), new Object[] { "XFX", "FEF", "XFX", 'X', new ItemStack(Items.dye, 1, 2), 'E', new ItemStack(GCItems.cheeseCurd), 'F', new ItemStack(Items.sugar) });
if (OreDictionary.getOres("ingotTitanium").size() > 0)
{
for (ItemStack stack : OreDictionary.getOres("ingotTitanium"))
{
CompressorRecipes.addShapelessRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 6), stack, stack);
}
}
=======
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 0), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 1), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 2), new ItemStack(Items.coal, 1, 1));
//Splintered ice into Ice
CompressorRecipes.addShapelessRecipe(new ItemStack(Blocks.ice), new ItemStack(AsteroidBlocks.blockDenseIce), new ItemStack(AsteroidBlocks.blockDenseIce));
//Slimeball
RecipeUtil.addRecipe(new ItemStack(Items.slime_ball), new Object [] { "XFX", "FEF", "XFX", 'X', new ItemStack(Items.dye, 1, 2), 'E', new ItemStack(GCItems.cheeseCurd), 'F', new ItemStack(Items.sugar) } );
if (ConfigManagerCore.recipesRequireGCAdvancedMetals)
CompressorRecipes.addShapelessRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 6), titaniumIngot, titaniumIngot);
else
{
if (OreDictionary.getOres("ingotTitanium").size() > 0)
{
for (ItemStack stack : OreDictionary.getOres("ingotTitanium"))
{
CompressorRecipes.addShapelessRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 6), stack, stack);
}
}
}
>>>>>>>
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 0), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 1), new ItemStack(Items.coal, 1, 1));
CompressorRecipes.addShapelessAdventure(new ItemStack(Items.coal, 2, 0), new ItemStack(Items.coal, 1, 1), new ItemStack(AsteroidBlocks.blockBasic, 1, 2), new ItemStack(Items.coal, 1, 1));
//Splintered ice into Ice
CompressorRecipes.addShapelessRecipe(new ItemStack(Blocks.ice), new ItemStack(AsteroidBlocks.blockDenseIce), new ItemStack(AsteroidBlocks.blockDenseIce));
//Slimeball
RecipeUtil.addRecipe(new ItemStack(Items.slime_ball), new Object [] { "XFX", "FEF", "XFX", 'X', new ItemStack(Items.dye, 1, 2), 'E', new ItemStack(GCItems.cheeseCurd), 'F', new ItemStack(Items.sugar) } );
if (ConfigManagerCore.recipesRequireGCAdvancedMetals)
CompressorRecipes.addShapelessRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 6), titaniumIngot, titaniumIngot);
else
{
if (OreDictionary.getOres("ingotTitanium").size() > 0)
{
for (ItemStack stack : OreDictionary.getOres("ingotTitanium"))
{
CompressorRecipes.addShapelessRecipe(new ItemStack(AsteroidsItems.basicItem, 1, 6), stack, stack);
}
}
} |
<<<<<<<
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.registries.GameData;
=======
import net.minecraft.nbt.NBTTagCompound;
import net.minecraftforge.oredict.OreDictionary;
import net.minecraftforge.oredict.ShapedOreRecipe;
import net.minecraftforge.oredict.ShapelessOreRecipe;
>>>>>>>
import net.minecraft.item.crafting.ShapedRecipes;
import net.minecraft.nbt.NBTTagCompound;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.fml.common.Loader;
import net.minecraftforge.registries.GameData;
<<<<<<<
GameData.register_impl(rec);
}
=======
>>>>>>>
GameData.register_impl(rec);
}
<<<<<<<
=======
public static void addRecipeUpdatable(ItemStack result, Object[] obj)
{
CraftingManager.getInstance().getRecipeList().add(new OreRecipeUpdatable(result, obj));
}
/**
* An extended version of areItemStackTagsEqual which ignores LevelUp's "NoPlacing" tag on mined blocks
*/
public static boolean areItemStackTagsEqual(ItemStack stackA, ItemStack stackB)
{
if (ItemStack.areItemStackTagsEqual(stackA, stackB))
return true;
NBTTagCompound query = null;
if (stackA.getTagCompound() == null && stackB.getTagCompound() != null)
{
query = stackB.getTagCompound();
}
else if (stackA.getTagCompound() != null && stackB.getTagCompound() == null)
{
query = stackA.getTagCompound();
}
if (query != null)
{
if (query.getKeySet().size() == 1 && query.hasKey("NoPlacing"))
return true;
}
return false;
}
/**
*
* @param itemstack - it is assumed this one is not null in calling code
* @param itemstack1
* @return
*/
public static boolean stacksMatch(ItemStack itemstack, ItemStack itemstack1)
{
return !itemstack1.isEmpty() && itemstack1.getItem() == itemstack.getItem() && (!itemstack.getHasSubtypes() || itemstack.getItemDamage() == itemstack1.getItemDamage()) && RecipeUtil.areItemStackTagsEqual(itemstack, itemstack1);
}
>>>>>>>
/**
* An extended version of areItemStackTagsEqual which ignores LevelUp's "NoPlacing" tag on mined blocks
*/
public static boolean areItemStackTagsEqual(ItemStack stackA, ItemStack stackB)
{
if (ItemStack.areItemStackTagsEqual(stackA, stackB))
return true;
NBTTagCompound query = null;
if (stackA.getTagCompound() == null && stackB.getTagCompound() != null)
{
query = stackB.getTagCompound();
}
else if (stackA.getTagCompound() != null && stackB.getTagCompound() == null)
{
query = stackA.getTagCompound();
}
if (query != null)
{
if (query.getKeySet().size() == 1 && query.hasKey("NoPlacing"))
return true;
}
return false;
}
/**
*
* @param itemstack - it is assumed this one is not null in calling code
* @param itemstack1
* @return
*/
public static boolean stacksMatch(ItemStack itemstack, ItemStack itemstack1)
{
return !itemstack1.isEmpty() && itemstack1.getItem() == itemstack.getItem() && (!itemstack.getHasSubtypes() || itemstack.getItemDamage() == itemstack1.getItemDamage()) && RecipeUtil.areItemStackTagsEqual(itemstack, itemstack1);
} |
<<<<<<<
this.modelLeggings = new ModelPlayerGC(0.9F, false);
this.modelArmor = new ModelPlayerGC(0.25F, false);
=======
this.field_177189_c = new ModelPlayerGC(0.9F, false);
this.field_177186_d = new ModelPlayerGC(0.275F, false);
>>>>>>>
this.modelLeggings = new ModelPlayerGC(0.9F, false);
this.modelArmor = new ModelPlayerGC(0.275F, false); |
<<<<<<<
EventHandlerGC.generateOil(event.getWorld(), event.getRand(), worldX + 8, worldZ + 8, false);
=======
EventHandlerGC.generateOil(event.world, event.rand, worldX + 15, worldZ + 15, false);
>>>>>>>
EventHandlerGC.generateOil(event.getWorld(), event.getRand(), worldX + 15, worldZ + 15, false); |
<<<<<<<
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.JsonUtils;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.common.crafting.IRecipeFactory;
import net.minecraftforge.common.crafting.JsonContext;
import net.minecraftforge.common.crafting.CraftingHelper.ShapedPrimer;
import net.minecraftforge.oredict.OreIngredient;
=======
>>>>>>>
import net.minecraft.item.crafting.IRecipe;
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.JsonUtils;
import net.minecraft.util.NonNullList;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.common.crafting.CraftingHelper;
import net.minecraftforge.common.crafting.IRecipeFactory;
import net.minecraftforge.common.crafting.JsonContext;
import net.minecraftforge.common.crafting.CraftingHelper.ShapedPrimer;
import net.minecraftforge.oredict.OreIngredient; |
<<<<<<<
newWorld.spawnEntity(lander);
=======
newWorld.spawnEntityInWorld(lander);
lander.setWorld(newWorld);
newWorld.updateEntityWithOptionalForce(lander, true);
player.startRiding(lander);
>>>>>>>
newWorld.spawnEntity(lander);
lander.setWorld(newWorld);
newWorld.updateEntityWithOptionalForce(lander, true);
player.startRiding(lander); |
<<<<<<<
DimensionManager.registerDimension(dimID, WorldUtil.getDimensionTypeById(staticProviderID));
=======
ConfigManagerCore.setLoaded(dimID);
}
int id = Arrays.binarySearch(ConfigManagerCore.staticLoadDimensions, dimID);
if (id >= 0)
{
DimensionManager.registerDimension(dimID, staticProviderID);
>>>>>>>
ConfigManagerCore.setLoaded(dimID);
}
int id = Arrays.binarySearch(ConfigManagerCore.staticLoadDimensions, dimID);
if (id >= 0)
{
DimensionManager.registerDimension(dimID, WorldUtil.getDimensionTypeById(staticProviderID));
<<<<<<<
player.interactionManager.setWorld((WorldServer) worldNew);
player.mcServer.getPlayerList().updateTimeAndWeatherForPlayer(player, (WorldServer) worldNew);
player.mcServer.getPlayerList().syncPlayerInventory(player);
=======
player.mcServer.getConfigurationManager().preparePlayer(player, (WorldServer) worldOld);
player.theItemInWorldManager.setWorld((WorldServer) worldNew);
player.mcServer.getConfigurationManager().updateTimeAndWeatherForPlayer(player, (WorldServer) worldNew);
player.mcServer.getConfigurationManager().syncPlayerInventory(player);
>>>>>>>
player.mcServer.getPlayerList().preparePlayer(player, (WorldServer) worldOld);
player.interactionManager.setWorld((WorldServer) worldNew);
player.mcServer.getPlayerList().updateTimeAndWeatherForPlayer(player, (WorldServer) worldNew);
player.mcServer.getPlayerList().syncPlayerInventory(player); |
<<<<<<<
import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe;
import micdoodle8.mods.galacticraft.api.recipe.ShapedRecipesGC;
import micdoodle8.mods.galacticraft.api.recipe.ShapelessOreRecipeGC;
=======
import micdoodle8.mods.galacticraft.core.GCItems;
>>>>>>>
import micdoodle8.mods.galacticraft.api.recipe.INasaWorkbenchRecipe;
import micdoodle8.mods.galacticraft.api.recipe.ShapedRecipesGC;
import micdoodle8.mods.galacticraft.api.recipe.ShapelessOreRecipeGC;
import micdoodle8.mods.galacticraft.core.GCItems;
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeWrapper;
=======
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeHandler;
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeMaker;
>>>>>>>
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeWrapper;
<<<<<<<
registry.handleRecipes(INasaWorkbenchRecipe.class, Tier1RocketRecipeWrapper::new, RecipeCategories.ROCKET_T1_ID);
registry.handleRecipes(INasaWorkbenchRecipe.class, BuggyRecipeWrapper::new, RecipeCategories.BUGGY_ID);
registry.handleRecipes(CircuitFabricatorRecipeWrapper.class, recipe -> recipe, RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.handleRecipes(ShapedRecipesGC.class, IngotCompressorShapedRecipeWrapper::new, RecipeCategories.INGOT_COMPRESSOR_ID);
registry.handleRecipes(ShapelessOreRecipeGC.class, IngotCompressorShapelessRecipeWrapper::new, RecipeCategories.INGOT_COMPRESSOR_ID);
registry.handleRecipes(RefineryRecipeWrapper.class, recipe -> recipe, RecipeCategories.REFINERY_ID);
registry.addRecipes(GalacticraftRegistry.getRocketT1Recipes(), RecipeCategories.ROCKET_T1_ID);
registry.addRecipes(GalacticraftRegistry.getBuggyBenchRecipes(), RecipeCategories.BUGGY_ID);
registry.addRecipes(CircuitFabricatorRecipeMaker.getRecipesList(), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipes(CompressorRecipes.getRecipeList(), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipes(RefineryRecipeMaker.getRecipesList(), RecipeCategories.REFINERY_ID);
=======
registry.addRecipeHandlers(new Tier1RocketRecipeHandler(),
new BuggyRecipeHandler(),
new CircuitFabricatorRecipeHandler(),
new IngotCompressorShapedRecipeHandler(),
new IngotCompressorShapelessRecipeHandler(),
new RefineryRecipeHandler());
registry.addRecipes(Tier1RocketRecipeMaker.getRecipesList());
registry.addRecipes(BuggyRecipeMaker.getRecipesList());
registry.addRecipes(CircuitFabricatorRecipeMaker.getRecipesList());
registry.addRecipes(CompressorRecipes.getRecipeList());
registry.addRecipes(RefineryRecipeMaker.getRecipesList());
GCItems.hideItemsJEI(registry.getJeiHelpers().getItemBlacklist());
>>>>>>>
registry.handleRecipes(INasaWorkbenchRecipe.class, Tier1RocketRecipeWrapper::new, RecipeCategories.ROCKET_T1_ID);
registry.handleRecipes(INasaWorkbenchRecipe.class, BuggyRecipeWrapper::new, RecipeCategories.BUGGY_ID);
registry.handleRecipes(CircuitFabricatorRecipeWrapper.class, recipe -> recipe, RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.handleRecipes(ShapedRecipesGC.class, IngotCompressorShapedRecipeWrapper::new, RecipeCategories.INGOT_COMPRESSOR_ID);
registry.handleRecipes(ShapelessOreRecipeGC.class, IngotCompressorShapelessRecipeWrapper::new, RecipeCategories.INGOT_COMPRESSOR_ID);
registry.handleRecipes(RefineryRecipeWrapper.class, recipe -> recipe, RecipeCategories.REFINERY_ID);
registry.addRecipes(GalacticraftRegistry.getRocketT1Recipes(), RecipeCategories.ROCKET_T1_ID);
registry.addRecipes(GalacticraftRegistry.getBuggyBenchRecipes(), RecipeCategories.BUGGY_ID);
registry.addRecipes(CircuitFabricatorRecipeMaker.getRecipesList(), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipes(CompressorRecipes.getRecipeList(), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipes(RefineryRecipeMaker.getRecipesList(), RecipeCategories.REFINERY_ID);
GCItems.hideItemsJEI(registry.getJeiHelpers().getItemBlacklist()); |
<<<<<<<
import net.minecraft.init.SoundEvents;
import net.minecraft.item.EnumAction;
=======
>>>>>>>
import net.minecraft.init.SoundEvents;
<<<<<<<
if (entityLiving instanceof EntityPlayer)
{
((EntityPlayer) entityLiving).getFoodStats().addStats(this.getHealAmount(stack), this.getSaturationModifier(stack));
}
worldIn.playSound(null, entityLiving.posX, entityLiving.posY, entityLiving.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F);
=======
playerIn.getFoodStats().addStats(this, stack);
worldIn.playSoundAtEntity(playerIn, "random.burp", 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F);
>>>>>>>
if (entityLiving instanceof EntityPlayer)
{
((EntityPlayer) entityLiving).getFoodStats().addStats(this, stack);
}
worldIn.playSound(null, entityLiving.posX, entityLiving.posY, entityLiving.posZ, SoundEvents.ENTITY_PLAYER_BURP, SoundCategory.PLAYERS, 0.5F, worldIn.rand.nextFloat() * 0.1F + 0.9F);
<<<<<<<
public int getMaxItemUseDuration(ItemStack par1ItemStack)
{
return 32;
}
@Override
public EnumAction getItemUseAction(ItemStack par1ItemStack)
{
return EnumAction.EAT;
}
@Override
public ActionResult<ItemStack> onItemRightClick(ItemStack itemStackIn, World worldIn, EntityPlayer playerIn, EnumHand hand)
{
if (playerIn.canEat(false))
{
playerIn.setActiveHand(hand);
return new ActionResult<>(EnumActionResult.SUCCESS, itemStackIn);
}
return new ActionResult<>(EnumActionResult.FAIL, itemStackIn);
}
@Override
=======
>>>>>>> |
<<<<<<<
protected final CompositeConfiguration config;
protected final ContentStore db;
=======
protected final Configuration config;
protected final ODatabaseDocumentTx db;
>>>>>>>
protected final Configuration config;
protected final ContentStore db;
<<<<<<<
protected AbstractTemplateEngine(final CompositeConfiguration config, final ContentStore db, final File destination, final File templatesPath) {
=======
protected AbstractTemplateEngine(final Configuration config, final ODatabaseDocumentTx db, final File destination, final File templatesPath) {
>>>>>>>
protected AbstractTemplateEngine(final Configuration config, final ContentStore db, final File destination, final File templatesPath) { |
<<<<<<<
import micdoodle8.mods.galacticraft.api.prefab.entity.EntityTieredRocket;
=======
import micdoodle8.mods.galacticraft.api.entity.ICameraZoomEntity;
import micdoodle8.mods.galacticraft.api.world.IGalacticraftWorldProvider;
import micdoodle8.mods.galacticraft.api.world.IZeroGDimension;
>>>>>>>
import micdoodle8.mods.galacticraft.api.entity.ICameraZoomEntity;
<<<<<<<
import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
=======
import net.minecraft.client.renderer.entity.RendererLivingEntity;
import net.minecraft.entity.Entity;
import net.minecraft.entity.EntityLivingBase;
>>>>>>>
import net.minecraft.client.renderer.entity.layers.LayerBipedArmor;
import net.minecraft.client.renderer.entity.layers.LayerRenderer;
import net.minecraft.entity.Entity; |
<<<<<<<
if (tile instanceof TileEntityCoalGenerator)
{
TileEntityCoalGenerator tileEntity = (TileEntityCoalGenerator) tile;
if (tileEntity.heatGJperTick > 0)
{
int metadata = getMetaFromState(stateIn);
float particlePosX = pos.getX() + 0.5F;
float particlePosY = pos.getY() + 0.0F + rand.nextFloat() * 6.0F / 16.0F;
float particlePosZ = pos.getZ() + 0.5F;
float particleSize0 = 0.52F;
float particleSize1 = rand.nextFloat() * 0.6F - 0.3F;
if (metadata == 3)
{
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, particlePosX - particleSize0, particlePosY, particlePosZ + particleSize1, 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.FLAME, particlePosX - particleSize0, particlePosY, particlePosZ + particleSize1, 0.0D, 0.0D, 0.0D);
}
else if (metadata == 2)
{
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, particlePosX + particleSize0, particlePosY, particlePosZ + particleSize1, 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.FLAME, particlePosX + particleSize0, particlePosY, particlePosZ + particleSize1, 0.0D, 0.0D, 0.0D);
}
else if (metadata == 1)
{
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, particlePosX + particleSize1, particlePosY, particlePosZ - particleSize0, 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.FLAME, particlePosX + particleSize1, particlePosY, particlePosZ - particleSize0, 0.0D, 0.0D, 0.0D);
}
else if (metadata == 0)
{
worldIn.spawnParticle(EnumParticleTypes.SMOKE_NORMAL, particlePosX + particleSize1, particlePosY, particlePosZ + particleSize0, 0.0D, 0.0D, 0.0D);
worldIn.spawnParticle(EnumParticleTypes.FLAME, particlePosX + particleSize1, particlePosY, particlePosZ + particleSize0, 0.0D, 0.0D, 0.0D);
}
}
}
=======
>>>>>>> |
<<<<<<<
{
if (!TileEntityOxygenSealer.loadedTiles.contains(this))
{
TileEntityOxygenSealer.loadedTiles.add(this);
}
}
=======
if (!TileEntityOxygenSealer.loadedTiles.contains(this)) TileEntityOxygenSealer.loadedTiles.add(this);
this.stopSealThreadCooldown = 126 + countEntities;
>>>>>>>
{
if (!TileEntityOxygenSealer.loadedTiles.contains(this))
{
TileEntityOxygenSealer.loadedTiles.add(this);
}
this.stopSealThreadCooldown = 126 + countEntities;
} |
<<<<<<<
=======
import micdoodle8.mods.galacticraft.core.network.PacketSimple;
import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket;
import micdoodle8.mods.galacticraft.core.energy.tile.EnergyStorageTile;
>>>>>>>
import micdoodle8.mods.galacticraft.core.network.PacketSimple;
import micdoodle8.mods.galacticraft.core.network.PacketSimple.EnumSimplePacket;
<<<<<<<
=======
import net.minecraft.nbt.NBTTagList;
import net.minecraft.tileentity.TileEntity;
>>>>>>> |
<<<<<<<
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.air.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, chunkBox);
<<<<<<<
this.setBlockState(worldIn, Blocks.GLOWSTONE.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.glowstone.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.GLOWSTONE.getDefaultState(), i, j, k, chunkBox);
<<<<<<<
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.air.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.AIR.getDefaultState(), i, j, k, chunkBox); |
<<<<<<<
import static org.junit.Assert.assertTrue;
=======
import static org.assertj.core.api.Assertions.assertThat;
>>>>>>>
import static org.junit.Assert.assertTrue;
import static org.assertj.core.api.Assertions.assertThat;
<<<<<<<
@Test
public void testIsFileInDirectory() throws Exception {
File fixtureDir = new File(this.getClass().getResource("/fixture").getFile());
File jbakeFile = new File(fixtureDir.getCanonicalPath() + File.separatorChar + "jbake.properties");
assertTrue("jbake.properties expected to be in /fixture directory", FileUtil.isFileInDirectory(jbakeFile, fixtureDir));
File contentFile = new File(fixtureDir.getCanonicalPath() + File.separatorChar + "content" + File.separatorChar + "projects.html");
assertTrue("projects.html expected to be nested in the /fixture directory", FileUtil.isFileInDirectory(contentFile, fixtureDir));
File contentDir = contentFile.getParentFile();
assertFalse("jbake.properties file should not be in the /fixture/content directory", FileUtil.isFileInDirectory(jbakeFile, contentDir));
}
=======
@Test
public void testGetContentRoothPath() throws Exception {
File source = TestUtils.getTestResourcesAsSourceFolder();
ConfigUtil util = new ConfigUtil();
DefaultJBakeConfiguration config = (DefaultJBakeConfiguration) util.loadConfig(source);
String path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "index.html"));
assertThat(path).isEqualTo("");
path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "/blog/index.html"));
assertThat(path).isEqualTo("../");
path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "/blog/level2/index.html"));
assertThat(path).isEqualTo("../../");
}
>>>>>>>
@Test
public void testIsFileInDirectory() throws Exception {
File fixtureDir = new File(this.getClass().getResource("/fixture").getFile());
File jbakeFile = new File(fixtureDir.getCanonicalPath() + File.separatorChar + "jbake.properties");
assertTrue("jbake.properties expected to be in /fixture directory", FileUtil.isFileInDirectory(jbakeFile, fixtureDir));
File contentFile = new File(fixtureDir.getCanonicalPath() + File.separatorChar + "content" + File.separatorChar + "projects.html");
assertTrue("projects.html expected to be nested in the /fixture directory", FileUtil.isFileInDirectory(contentFile, fixtureDir));
File contentDir = contentFile.getParentFile();
assertFalse("jbake.properties file should not be in the /fixture/content directory", FileUtil.isFileInDirectory(jbakeFile, contentDir));
}
@Test
public void testGetContentRoothPath() throws Exception {
File source = TestUtils.getTestResourcesAsSourceFolder();
ConfigUtil util = new ConfigUtil();
DefaultJBakeConfiguration config = (DefaultJBakeConfiguration) util.loadConfig(source);
String path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "index.html"));
assertThat(path).isEqualTo("");
path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "/blog/index.html"));
assertThat(path).isEqualTo("../");
path = FileUtil.getUriPathToContentRoot(config, new File(config.getContentFolder(), "/blog/level2/index.html"));
assertThat(path).isEqualTo("../../");
} |
<<<<<<<
=======
import net.minecraft.nbt.NBTTagList;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
>>>>>>> |
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCItems.oxTankLight, 1, GCItems.oxTankLight.getMaxDamage()), new Object[] { "Z", "X", "Y", 'X', new ItemStack(GCItems.canister, 1, 0), 'Y', "compressedCopper", 'Z', new ItemStack(Blocks.WOOL, 1, 5) });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.fluidTank, 1), new Object[] { " X ", "X X", "XXX", 'X', Blocks.glass_pane });
RecipeUtil.addRecipe(new ItemStack(GCItems.oxTankLight, 1, GCItems.oxTankLight.getMaxDamage()), new Object[] { "Z", "X", "Y", 'X', new ItemStack(GCItems.canister, 1, 0), 'Y', "compressedCopper", 'Z', new ItemStack(Blocks.wool, 1, 5) });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.fluidTank, 1), new Object[] { " X ", "X X", "XXX", 'X', Blocks.GLASS_PANE });
RecipeUtil.addRecipe(new ItemStack(GCItems.oxTankLight, 1, GCItems.oxTankLight.getMaxDamage()), new Object[] { "Z", "X", "Y", 'X', new ItemStack(GCItems.canister, 1, 0), 'Y', "compressedCopper", 'Z', new ItemStack(Blocks.WOOL, 1, 5) });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassClear, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "ingotAluminum" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassVanilla, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "ingotTin" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassStrong, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "compressedAluminum" }); //https://en.wikipedia.org/wiki/List_of_Star_Trek_materials#Transparent_aluminum
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassTinClear, 5), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassClear, 'Y', GCBlocks.basicBlock });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassTinVanilla, 5), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassVanilla, 'Y', GCBlocks.basicBlock });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassTinStrong, 5), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassStrong, 'Y', GCBlocks.basicBlock });
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassClear, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.glass, 'Y', "ingotAluminum" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassVanilla, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.glass, 'Y', "ingotTin" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassStrong, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.glass, 'Y', "compressedAluminum" }); //https://en.wikipedia.org/wiki/List_of_Star_Trek_materials#Transparent_aluminum
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassClear, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassClear, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassVanilla, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassVanilla, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassStrong, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassStrong, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassClear, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "ingotAluminum" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassVanilla, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "ingotTin" });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassStrong, 5), new Object[] { "YXY", "XXX", "YXY", 'X', Blocks.GLASS, 'Y', "compressedAluminum" }); //https://en.wikipedia.org/wiki/List_of_Star_Trek_materials#Transparent_aluminum
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassClear, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassClear, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassVanilla, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassVanilla, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) });
RecipeUtil.addRecipe(new ItemStack(GCBlocks.spaceGlassStrong, 5, 1), new Object[] { "YXY", "XXX", "YXY", 'X', GCBlocks.spaceGlassStrong, 'Y', new ItemStack(GCBlocks.basicBlock, 1, 4) }); |
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 20, this.getPos().getY() - 8, this.getPos().getZ() - 20, this.getPos().getX() + 20, this.getPos().getY() + 20, this.getPos().getZ() + 20);
=======
>>>>>>>
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 20, this.getPos().getY() - 20, this.getPos().getZ() - 20, this.getPos().getX() + 20, this.getPos().getY() + 8, this.getPos().getZ() + 20);
=======
>>>>>>>
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 20, this.getPos().getY() - 20, this.getPos().getZ() - 8, this.getPos().getX() + 20, this.getPos().getY() + 20, this.getPos().getZ() + 20);
=======
>>>>>>>
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 20, this.getPos().getY() - 20, this.getPos().getZ() - 20, this.getPos().getX() + 20, this.getPos().getY() + 20, this.getPos().getZ() + 8);
=======
>>>>>>>
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 8, this.getPos().getY() - 20, this.getPos().getZ() - 20, this.getPos().getX() + 20, this.getPos().getY() + 20, this.getPos().getZ() + 20);
=======
>>>>>>>
<<<<<<<
this.thisAABB = new AxisAlignedBB(this.getPos().getX() - 20, this.getPos().getY() - 20, this.getPos().getZ() - 20, this.getPos().getX() + 8, this.getPos().getY() + 20, this.getPos().getZ() + 20);
=======
>>>>>>>
<<<<<<<
Vec3d vecNewTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(e, 16, 7, this.thisPos);
if (vecNewTarget == null)
{
continue;
}
PathNavigate nav = e.getNavigator();
=======
PathNavigate nav = mob.getNavigator();
>>>>>>>
PathNavigate nav = mob.getNavigator();
<<<<<<<
inFront = inFront.newVecSide(this.facingSide).newVecSide(sideskip1 ^ 1);
IBlockState state = inFront.getBlockStateSafe_noChunkLoad(world);
if (state.getBlock().getLightOpacity(state) < 15)
=======
inFront = inFront.newVecSide(this.facingSide);
Block b = inFront.getBlockIDsafe_noChunkLoad(world);
if (b == null || b.getLightOpacity() == 15)
{
break;
}
inFront = inFront.newVecSide(sideskip1 ^ 1);
b = inFront.getBlockIDsafe_noChunkLoad(world);
if (b != null && b.getLightOpacity() < 15)
>>>>>>>
inFront = inFront.newVecSide(this.facingSide);
IBlockState state = inFront.getBlockStateSafe_noChunkLoad(world);
if (state.getBlock().getLightOpacity(state) == 15)
{
break;
}
inFront = inFront.newVecSide(sideskip1 ^ 1);
state = inFront.getBlockStateSafe_noChunkLoad(world);
if (state.getBlock().getLightOpacity(state) < 15)
<<<<<<<
IBlockState state = sideVec.getBlockStateSafe_noChunkLoad(world);
if (state.getBlock() instanceof BlockAir)
=======
Block b = sideVec.getBlockIDsafe_noChunkLoad(world);
if (b instanceof BlockAir)
{
if (toAdd && side != sideskip1 && side != sideskip2)
>>>>>>>
IBlockState bs = sideVec.getBlockStateSafe_noChunkLoad(world);
Block b = bs.getBlock();
if (b instanceof BlockAir)
{
if (toAdd && side != sideskip1 && side != sideskip2)
<<<<<<<
allAir = false;
if (state.getBlock().getLightOpacity(state, world, sideVec.toBlockPos()) == 0)
=======
if (toAdd && b != null && b.getLightOpacity(world, sideVec.toBlockPos()) == 0)
>>>>>>>
if (toAdd && b != null && b.getLightOpacity(bs, world, sideVec.toBlockPos()) == 0)
<<<<<<<
IBlockState state = vec.getBlockStateSafe_noChunkLoad(world);
if (Blocks.AIR == state.getBlock())
=======
airNew.add(vec);
Block id = vec.getBlockIDsafe_noChunkLoad(world);
if (Blocks.air == id)
>>>>>>>
airNew.add(vec);
Block id = vec.getBlockStateSafe_noChunkLoad(world).getBlock();
if (Blocks.AIR == id) |
<<<<<<<
if (this.landing)
{
this.rotationPitch = this.rotationYaw = 0;
}
if (!this.world.isRemote)
=======
if (!this.worldObj.isRemote)
>>>>>>>
if (!this.world.isRemote) |
<<<<<<<
Block bStart = this.worldProvider.world.getBlockState(this.oneSSBlock).getBlock();
=======
IBlockState bsStart = this.worldProvider.worldObj.getBlockState(this.oneSSBlock);
Block bStart = bsStart.getBlock();
>>>>>>>
IBlockState bsStart = this.worldProvider.world.getBlockState(this.oneSSBlock);
Block bStart = bsStart.getBlock();
<<<<<<<
IBlockState state = sideVec.getBlockState(this.worldProvider.world);
=======
IBlockState state = sideVec.getBlockState(this.worldProvider.worldObj);
if (state == null)
{
continue;
}
>>>>>>>
IBlockState state = sideVec.getBlockState(this.worldProvider.world);
if (state == null)
{
continue;
}
<<<<<<<
if (b != null && !b.isAir(this.worldProvider.world.getBlockState(sideVec.toBlockPos()), this.worldProvider.world, sideVec.toBlockPos()))
=======
if (b != null && !b.isAir(state, this.worldProvider.worldObj, sideVec.toBlockPos()) && !(b instanceof BlockDynamicLiquid))
>>>>>>>
if (b != null && !b.isAir(state, this.worldProvider.world, sideVec.toBlockPos()) && !(b instanceof BlockDynamicLiquid))
<<<<<<<
if (bStart.isAir(this.worldProvider.world.getBlockState(this.oneSSBlock), this.worldProvider.world, this.oneSSBlock))
=======
if (bStart.isAir(bsStart, this.worldProvider.worldObj, this.oneSSBlock))
>>>>>>>
if (bStart.isAir(bsStart, this.worldProvider.world, this.oneSSBlock))
<<<<<<<
m = b.getBlockHardness(this.worldProvider.world.getBlockState(sideVec.toBlockPos()), this.worldProvider.world, sideVec.toBlockPos());
=======
m = b.getBlockHardness(state, this.worldProvider.worldObj, sideVec.toBlockPos());
>>>>>>>
m = b.getBlockHardness(state, this.worldProvider.world, sideVec.toBlockPos()); |
<<<<<<<
long newTCO = time - world.getWorldInfo().getWorldTime();
long diff = newTCO - this.timeCurrentOffset;
if (diff > 1L)
=======
if (JavaUtil.instance.isCalledBy(CommandTime.class))
>>>>>>>
if (JavaUtil.instance.isCalledBy(CommandTime.class))
<<<<<<<
return world.getWorldInfo().getWorldTime() + this.timeCurrentOffset;
=======
if (JavaUtil.instance.isCalledBy(CommandTime.class))
{
this.saveTCO = this.timeCurrentOffset;
}
return worldObj.getWorldInfo().getWorldTime() + this.timeCurrentOffset;
>>>>>>>
if (JavaUtil.instance.isCalledBy(CommandTime.class))
{
this.saveTCO = this.timeCurrentOffset;
}
return world.getWorldInfo().getWorldTime() + this.timeCurrentOffset; |
<<<<<<<
IStatsCapability stats = entityPlayer.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
entityPlayer.sendMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", stats.getCryogenicChamberCooldown() / 20)));
=======
GCPlayerStats stats = GCPlayerStats.get(entityPlayer);
entityPlayer.addChatMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", stats.getCryogenicChamberCooldown() / 20)));
>>>>>>>
GCPlayerStats stats = GCPlayerStats.get(entityPlayer);
entityPlayer.sendMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", stats.getCryogenicChamberCooldown() / 20))); |
<<<<<<<
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 4, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusFlat.getBiomeName(), BiomeVenus.venusFlat);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 5, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusMountain.getBiomeName(), BiomeVenus.venusMountain);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 6, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusValley.getBiomeName(), BiomeVenus.venusValley);
=======
MinecraftForge.EVENT_BUS.register(new VenusTickHandlerServer());
>>>>>>>
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 4, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusFlat.getBiomeName(), BiomeVenus.venusFlat);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 5, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusMountain.getBiomeName(), BiomeVenus.venusMountain);
Biome.registerBiome(ConfigManagerCore.biomeIDbase + 6, GalacticraftPlanets.TEXTURE_PREFIX + BiomeVenus.venusValley.getBiomeName(), BiomeVenus.venusValley);
MinecraftForge.EVENT_BUS.register(new VenusTickHandlerServer()); |
<<<<<<<
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
=======
import net.minecraft.client.renderer.culling.ICamera;
>>>>>>>
import net.minecraft.client.renderer.block.model.ModelResourceLocation;
import net.minecraft.client.renderer.culling.ICamera;
<<<<<<<
=======
import net.minecraft.client.resources.model.ModelResourceLocation;
import net.minecraft.util.AxisAlignedBB;
import net.minecraft.util.MathHelper;
>>>>>>> |
<<<<<<<
worldData.dim = world.provider.getDimension();
((WorldProviderZeroGravity) world.provider).getSpinManager().writeToNBT(worldData.datacompound);
=======
worldData.dim = world.provider.getDimensionId();
((WorldProviderSpaceStation) world.provider).getSpinManager().writeToNBT(worldData.datacompound);
>>>>>>>
worldData.dim = world.provider.getDimension();
((WorldProviderSpaceStation) world.provider).getSpinManager().writeToNBT(worldData.datacompound); |
<<<<<<<
public static final PropertyEnum WEB_TYPE = PropertyEnum.create("webtype", EnumWebType.class);
protected static final AxisAlignedBB AABB_WEB = new AxisAlignedBB(0.35, 0.0, 0.35, 0.65, 1.0, 0.65);
protected static final AxisAlignedBB AABB_WEB_TORCH = new AxisAlignedBB(0.35, 0.25, 0.35, 0.65, 1.0, 0.65);
=======
public static final PropertyEnum<EnumWebType> WEB_TYPE = PropertyEnum.create("webType", EnumWebType.class);
>>>>>>>
public static final PropertyEnum<EnumWebType> WEB_TYPE = PropertyEnum.create("webtype", EnumWebType.class);
protected static final AxisAlignedBB AABB_WEB = new AxisAlignedBB(0.35, 0.0, 0.35, 0.65, 1.0, 0.65);
protected static final AxisAlignedBB AABB_WEB_TORCH = new AxisAlignedBB(0.35, 0.25, 0.35, 0.65, 1.0, 0.65); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.util.ConfigManagerCore;
import micdoodle8.mods.galacticraft.planets.GCPlanetDimensions;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.planets.GCPlanetDimensions;
<<<<<<<
import net.minecraft.entity.player.EntityPlayerMP;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
=======
import micdoodle8.mods.galacticraft.planets.venus.world.gen.WorldChunkManagerVenus;
import net.minecraft.util.MathHelper;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.IChunkProvider;
>>>>>>>
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
<<<<<<<
public boolean shouldForceRespawn()
{
return !ConfigManagerCore.forceOverworldRespawn;
}
@Override
public Class<? extends IChunkGenerator> getChunkProviderClass()
=======
public Class<? extends IChunkProvider> getChunkProviderClass()
>>>>>>>
public Class<? extends IChunkGenerator> getChunkProviderClass()
<<<<<<<
//Overriding only in case the Galacticraft API is not up-to-date
//(with up-to-date API this makes zero difference)
@Override
public int getRespawnDimension(EntityPlayerMP player)
{
return this.shouldForceRespawn() ? this.getDimension() : 0;
}
=======
>>>>>>> |
<<<<<<<
import net.minecraftforge.fluids.FluidUtil;
import net.minecraftforge.fluids.capability.CapabilityFluidHandler;
=======
>>>>>>>
import net.minecraftforge.fluids.capability.CapabilityFluidHandler; |
<<<<<<<
private boolean updatingRidden = false;
@Override
public void clonePlayer(EntityPlayerMP player, EntityPlayer oldPlayer, boolean keepInv)
{
if (oldPlayer instanceof EntityPlayerMP)
{
GCPlayerStats newStats = GCPlayerStats.get(player);
GCPlayerStats oldStats = GCPlayerStats.get(oldPlayer);
newStats.copyFrom(oldStats, keepInv || player.worldObj.getGameRules().getBoolean("keepInventory"));
TileEntityTelemetry.updateLinkedPlayer((EntityPlayerMP) oldPlayer, player);
}
}
=======
boolean updatingRidden = false;
static List<EntityPlayer> noClipList = new LinkedList<>();
>>>>>>>
private boolean updatingRidden = false;
static List<EntityPlayer> noClipList = new LinkedList<>();
<<<<<<<
=======
public boolean wakeUpPlayer(EntityPlayerMP player, boolean par1, boolean par2, boolean par3, boolean bypass)
{
BlockPos c = player.playerLocation;
if (c != null)
{
EventWakePlayer event = new EventWakePlayer(player, c, par1, par2, par3, bypass);
MinecraftForge.EVENT_BUS.post(event);
if (bypass || event.result == null || event.result == EntityPlayer.EnumStatus.OK)
{
return false;
}
}
return true;
}
@Override
public boolean isSpectator(EntityPlayerMP player)
{
return noClipList.contains(player);
}
@Override
public void setNoClip(EntityPlayerMP player, boolean noClip)
{
if (noClip)
{
if (!noClipList.contains(player))
noClipList.add(player);
}
else
{
noClipList.remove(player);
}
}
>>>>>>>
@Override
public boolean isSpectator(EntityPlayerMP player)
{
return noClipList.contains(player);
}
@Override
public void setNoClip(EntityPlayerMP player, boolean noClip)
{
if (noClip)
{
if (!noClipList.contains(player))
noClipList.add(player);
}
else
{
noClipList.remove(player);
}
} |
<<<<<<<
@RuntimeInterface(clazz = "cofh.api.energy.IEnergyHandler", modID = "")
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate)
=======
@RuntimeInterface(clazz = "cofh.api.energy.IEnergyProvider", modID = "")
public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate)
>>>>>>>
@RuntimeInterface(clazz = "cofh.api.energy.IEnergyProvider", modID = "")
public int extractEnergy(EnumFacing from, int maxExtract, boolean simulate) |
<<<<<<<
import net.minecraft.init.SoundEvents;
import net.minecraft.inventory.IInventory;
=======
>>>>>>>
import net.minecraft.init.SoundEvents;
<<<<<<<
import net.minecraft.util.SoundCategory;
import net.minecraft.util.text.ITextComponent;
=======
>>>>>>>
import net.minecraft.util.SoundCategory;
<<<<<<<
public int getField(int id)
{
return 0;
}
@Override
public void setField(int id, int value)
{
}
@Override
public int getFieldCount()
{
return 0;
}
@Override
public void clear()
{
}
@Override
public boolean hasCustomName()
{
return false;
}
@Override
public ITextComponent getDisplayName()
{
return null;
}
@Override
=======
>>>>>>> |
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeWrapper;
import micdoodle8.mods.galacticraft.core.recipe.ShapedRecipeNBT;
=======
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
>>>>>>>
import micdoodle8.mods.galacticraft.core.client.jei.tier1rocket.Tier1RocketRecipeWrapper;
import micdoodle8.mods.galacticraft.core.recipe.ShapedRecipeNBT;
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
<<<<<<<
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
=======
>>>>>>>
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.LinkedList;
import java.util.List;
<<<<<<<
=======
registry.addRecipeHandlers(new Tier1RocketRecipeHandler(),
new BuggyRecipeHandler(),
new CircuitFabricatorRecipeHandler(),
new IngotCompressorShapedRecipeHandler(),
new IngotCompressorShapelessRecipeHandler(),
new OxygenCompressorRecipeHandler(),
new RefineryRecipeHandler(),
new NBTSensitiveShapedRecipeHandler());
registry.addRecipes(Tier1RocketRecipeMaker.getRecipesList());
registry.addRecipes(BuggyRecipeMaker.getRecipesList());
registry.addRecipes(CircuitFabricatorRecipeMaker.getRecipesList());
registry.addRecipes(CompressorRecipes.getRecipeListAll());
registry.addRecipes(OxygenCompressorRecipeMaker.getRecipesList());
registry.addRecipes(RefineryRecipeMaker.getRecipesList());
ItemStack nasaWorkbench = new ItemStack(GCBlocks.nasaWorkbench);
registry.addRecipeCategoryCraftingItem(nasaWorkbench, RecipeCategories.ROCKET_T1_ID);
registry.addRecipeCategoryCraftingItem(nasaWorkbench, RecipeCategories.BUGGY_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.machineBase2, 1, 4), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.machineBase, 1, 12), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.machineBase2, 1, 0), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.refinery), RecipeCategories.REFINERY_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.oxygenCompressor), RecipeCategories.OXYGEN_COMPRESSOR_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.crafting), VanillaRecipeCategoryUid.CRAFTING);
registry.getRecipeTransferRegistry().addRecipeTransferHandler(new MagneticCraftingTransferInfo());
this.addInformationPages(registry);
GCItems.hideItemsJEI(registry.getJeiHelpers().getItemBlacklist());
>>>>>>> |
<<<<<<<
import net.minecraft.util.math.BlockPos;
=======
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.block.state.IBlockState;
import net.minecraft.util.BlockPos;
>>>>>>>
import net.minecraft.block.Block;
import net.minecraft.block.BlockAir;
import net.minecraft.block.state.IBlockState;
<<<<<<<
return w.getBlockState(pos).getBlock().getStrongPower(w.getBlockState(pos), w, pos, side);
=======
IBlockState bs = w.getBlockState(pos);
return bs.getBlock().getStrongPower(w, pos, bs, side);
>>>>>>>
IBlockState bs = w.getBlockState(pos);
return bs.getBlock().getStrongPower(bs, w, pos, side);
<<<<<<<
return w.getBlockState(pos).getBlock().getStrongPower(w.getBlockState(pos), w, pos, side);
=======
IBlockState bs = w.getBlockState(pos);
return bs.getBlock().getStrongPower(w, pos, bs, side);
}
/**
* Returns true if the block is being INDIRECTLY powered e.g by redstone passing through another block
* (similar to how a vanilla piston or redstone lamp responds)
*
* INEFFICIENT: (almost as bad as Vanilla!) examines redstone status of 30 nearby blocks if there is no redstone power
*
* Note: if the calling block is itself a redstone emitter (!!) its redstone output to neighbours will be ignored
*/
public static boolean isBlockReceivingRedstone(World w, BlockPos pos)
{
if (w == null)
{
return false;
}
// Check up/down without chunk load test first
if (getRedstonePowerIndirect(w, pos.up(1), EnumFacing.UP) > 0)
{
return true;
}
if (getRedstonePowerIndirect(w, pos.down(1), EnumFacing.DOWN) > 0)
{
return true;
}
for (EnumFacing facing : EnumFacing.HORIZONTALS)
{
if (getRedstonePowerIndirect_NoChunkLoad(w, pos.offset(facing, 1), facing) > 0)
{
return true;
}
}
return false;
}
public static int getRedstonePowerIndirect_NoChunkLoad(World w, BlockPos pos, EnumFacing side)
{
if (!w.isBlockLoaded(pos, false))
{
return 0;
}
return getRedstonePowerIndirect(w, pos, side);
}
public static int getRedstonePowerIndirect(World w, BlockPos pos, EnumFacing facing)
{
IBlockState bs = w.getBlockState(pos);
Block block = bs.getBlock();
if (block instanceof BlockAir)
{
return 0;
}
return block.shouldCheckWeakPower(w, pos, facing) ? getNeighbourPower_NoChunkLoad(w, pos, facing.getOpposite()) : block.getWeakPower(w, pos, bs, facing);
}
/**
* Similar to the vanilla method getStrongPower(BlockPos pos) but more efficient - doesn't backtrack, so 15% faster
* (also the low level code here is faster...)
*/
public static int getNeighbourPower_NoChunkLoad(World w, BlockPos pos, EnumFacing skip)
{
int i = 0;
int p;
IBlockState bs;
BlockPos sidePos;
if (skip != EnumFacing.DOWN)
{
sidePos = pos.add(0, -1, 0);
bs = w.getBlockState(sidePos);
i = bs.getBlock().getStrongPower(w, sidePos, bs, EnumFacing.DOWN);
if (i >= 15)
{
return i;
}
}
if (skip != EnumFacing.UP)
{
sidePos = pos.add(0, 1, 0);
bs = w.getBlockState(sidePos);
p = bs.getBlock().getStrongPower(w, sidePos, bs, EnumFacing.UP);
if (p >= 15)
{
return p;
}
if (p > i) i = p;
}
for (EnumFacing side : EnumFacing.HORIZONTALS)
{
if (side == skip)
{
continue;
}
//This is a slightly faster pos.offset(side)
sidePos = pos.add(side.getFrontOffsetX(), 0, side.getFrontOffsetZ());
if (!w.isBlockLoaded(sidePos, false))
{
continue;
}
bs = w.getBlockState(sidePos);
p = bs.getBlock().getStrongPower(w, sidePos, bs, side);
if (p >= 15)
{
return p;
}
if (p > i) i = p;
}
return i;
>>>>>>>
IBlockState bs = w.getBlockState(pos);
return bs.getBlock().getStrongPower(bs, w, pos, side);
}
/**
* Returns true if the block is being INDIRECTLY powered e.g by redstone passing through another block
* (similar to how a vanilla piston or redstone lamp responds)
*
* INEFFICIENT: (almost as bad as Vanilla!) examines redstone status of 30 nearby blocks if there is no redstone power
*
* Note: if the calling block is itself a redstone emitter (!!) its redstone output to neighbours will be ignored
*/
public static boolean isBlockReceivingRedstone(World w, BlockPos pos)
{
if (w == null)
{
return false;
}
// Check up/down without chunk load test first
if (getRedstonePowerIndirect(w, pos.up(1), EnumFacing.UP) > 0)
{
return true;
}
if (getRedstonePowerIndirect(w, pos.down(1), EnumFacing.DOWN) > 0)
{
return true;
}
for (EnumFacing facing : EnumFacing.HORIZONTALS)
{
if (getRedstonePowerIndirect_NoChunkLoad(w, pos.offset(facing, 1), facing) > 0)
{
return true;
}
}
return false;
}
public static int getRedstonePowerIndirect_NoChunkLoad(World w, BlockPos pos, EnumFacing side)
{
if (!w.isBlockLoaded(pos, false))
{
return 0;
}
return getRedstonePowerIndirect(w, pos, side);
}
public static int getRedstonePowerIndirect(World w, BlockPos pos, EnumFacing facing)
{
IBlockState bs = w.getBlockState(pos);
Block block = bs.getBlock();
if (block instanceof BlockAir)
{
return 0;
}
return block.shouldCheckWeakPower(bs, w, pos, facing) ? getNeighbourPower_NoChunkLoad(w, pos, facing.getOpposite()) : bs.getWeakPower(w, pos, facing);
}
/**
* Similar to the vanilla method getStrongPower(BlockPos pos) but more efficient - doesn't backtrack, so 15% faster
* (also the low level code here is faster...)
*/
public static int getNeighbourPower_NoChunkLoad(World w, BlockPos pos, EnumFacing skip)
{
int i = 0;
int p;
IBlockState bs;
BlockPos sidePos;
if (skip != EnumFacing.DOWN)
{
sidePos = pos.add(0, -1, 0);
bs = w.getBlockState(sidePos);
i = bs.getBlock().getStrongPower(bs, w, sidePos, EnumFacing.DOWN);
if (i >= 15)
{
return i;
}
}
if (skip != EnumFacing.UP)
{
sidePos = pos.add(0, 1, 0);
bs = w.getBlockState(sidePos);
p = bs.getBlock().getStrongPower(bs, w, sidePos, EnumFacing.UP);
if (p >= 15)
{
return p;
}
if (p > i) i = p;
}
for (EnumFacing side : EnumFacing.HORIZONTALS)
{
if (side == skip)
{
continue;
}
//This is a slightly faster pos.offset(side)
sidePos = pos.add(side.getFrontOffsetX(), 0, side.getFrontOffsetZ());
if (!w.isBlockLoaded(sidePos, false))
{
continue;
}
bs = w.getBlockState(sidePos);
p = bs.getBlock().getStrongPower(bs, w, sidePos, side);
if (p >= 15)
{
return p;
}
if (p > i) i = p;
}
return i; |
<<<<<<<
this.rand.setSeed(x * 341873128712L + z * 132897987541L);
// final Block[] ids = new Block[32768 * 2];
// final byte[] meta = new byte[32768 * 2];
this.generateTerrain(x, z, primer);
this.createCraters(x, z, primer);
this.biomesForGeneration = this.world.getBiomeProvider().getBiomes(this.biomesForGeneration, x * 16, z * 16, 16, 16);
this.replaceBiomeBlocks(x, z, primer, this.biomesForGeneration);
if (this.worldGenerators == null)
{
this.worldGenerators = this.getWorldGenerators();
}
=======
try {
this.rand.setSeed(x * 341873128712L + z * 132897987541L);
this.generateTerrain(x, z, primer);
this.createCraters(x, z, primer);
this.biomesForGeneration = this.worldObj.getBiomeProvider().getBiomes(this.biomesForGeneration, x * 16, z * 16, 16, 16);
this.replaceBiomeBlocks(x, z, primer, this.biomesForGeneration);
if (this.worldGenerators == null)
{
this.worldGenerators = this.getWorldGenerators();
}
>>>>>>>
try {
this.rand.setSeed(x * 341873128712L + z * 132897987541L);
this.generateTerrain(x, z, primer);
this.createCraters(x, z, primer);
this.biomesForGeneration = this.world.getBiomeProvider().getBiomes(this.biomesForGeneration, x * 16, z * 16, 16, 16);
this.replaceBiomeBlocks(x, z, primer, this.biomesForGeneration);
if (this.worldGenerators == null)
{
this.worldGenerators = this.getWorldGenerators();
} |
<<<<<<<
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getPos();
if (ConfigManagerCore.enableDebug)
{
GCLog.info("DEBUG: Loading first chunk in new dimension.");
}
((WorldServer) worldNew).getChunkProvider().loadChunk(pair.chunkXPos, pair.chunkZPos);
//entity.setLocationAndAngles(spawnPos.x, spawnPos.y, spawnPos.z, entity.rotationYaw, entity.rotationPitch);
worldNew.updateEntityWithOptionalForce(entity, false);
entity.setLocationAndAngles(spawnPos.x, spawnPos.y, spawnPos.z, entity.rotationYaw, entity.rotationPitch);
=======
>>>>>>>
<<<<<<<
spawnPos = type.getPlayerSpawnLocation((WorldServer) entity.world, (EntityPlayerMP) entity);
player.connection.setPlayerLocation(spawnPos.x, spawnPos.y, spawnPos.z, entity.rotationYaw, entity.rotationPitch);
entity.setLocationAndAngles(spawnPos.x, spawnPos.y, spawnPos.z, entity.rotationYaw, entity.rotationPitch);
worldNew.updateEntityWithOptionalForce(entity, false);
=======
spawnPos = type.getPlayerSpawnLocation((WorldServer) entity.worldObj, (EntityPlayerMP) entity);
//Do not actually set player to this position, this will be done later depending on whether in a rocket or not
>>>>>>>
spawnPos = type.getPlayerSpawnLocation((WorldServer) entity.world, (EntityPlayerMP) entity);
//Do not actually set player to this position, this will be done later depending on whether in a rocket or not
<<<<<<<
worldNew.spawnEntity(ridingRocket);
=======
if (ridingRocket != null)
{
worldNew.spawnEntityInWorld(ridingRocket);
>>>>>>>
if (ridingRocket != null)
{
worldNew.spawnEntity(ridingRocket); |
<<<<<<<
mc.world.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.025F, 0.6F + random.nextFloat() * 0.2F, false);
=======
mc.theWorld.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.WEATHER, 0.025F, 0.6F + random.nextFloat() * 0.2F, false);
>>>>>>>
mc.world.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.WEATHER, 0.025F, 0.6F + random.nextFloat() * 0.2F, false);
<<<<<<<
mc.world.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.BLOCKS, 0.04F, 0.8F + random.nextFloat() * 0.06F + random.nextFloat() * 0.06F, false);
=======
mc.theWorld.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.WEATHER, 0.04F, 0.8F + random.nextFloat() * 0.06F + random.nextFloat() * 0.06F, false);
>>>>>>>
mc.world.playSound(xx, yy, zz, SoundEvents.BLOCK_LAVA_EXTINGUISH, SoundCategory.WEATHER, 0.04F, 0.8F + random.nextFloat() * 0.06F + random.nextFloat() * 0.06F, false); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.