conflict_resolution
stringlengths 27
16k
|
|---|
<<<<<<<
import net.minecraft.block.properties.PropertyDirection;
import net.minecraft.block.state.BlockStateContainer;
=======
import net.minecraft.block.state.BlockState;
>>>>>>>
import net.minecraft.block.state.BlockStateContainer;
<<<<<<<
import net.minecraft.entity.EntityLivingBase;
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.IBlockAccess;
=======
import net.minecraft.util.*;
>>>>>>>
import net.minecraft.util.BlockRenderLayer;
import net.minecraft.util.EnumFacing;
import net.minecraft.util.math.BlockPos;
<<<<<<<
public static final PropertyDirection FACING = PropertyDirection.create("facing", facing -> facing != EnumFacing.DOWN);
protected static final AxisAlignedBB STANDING_AABB = new AxisAlignedBB(0.4000000059604645D, 0.0D, 0.4000000059604645D, 0.6000000238418579D, 0.6000000238418579D, 0.6000000238418579D);
protected static final AxisAlignedBB TORCH_NORTH_AABB = new AxisAlignedBB(0.3499999940395355D, 0.20000000298023224D, 0.699999988079071D, 0.6499999761581421D, 0.800000011920929D, 1.0D);
protected static final AxisAlignedBB TORCH_SOUTH_AABB = new AxisAlignedBB(0.3499999940395355D, 0.20000000298023224D, 0.0D, 0.6499999761581421D, 0.800000011920929D, 0.30000001192092896D);
protected static final AxisAlignedBB TORCH_WEST_AABB = new AxisAlignedBB(0.699999988079071D, 0.20000000298023224D, 0.3499999940395355D, 1.0D, 0.800000011920929D, 0.6499999761581421D);
protected static final AxisAlignedBB TORCH_EAST_AABB = new AxisAlignedBB(0.0D, 0.20000000298023224D, 0.3499999940395355D, 0.30000001192092896D, 0.800000011920929D, 0.6499999761581421D);
=======
>>>>>>>
<<<<<<<
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(worldIn.getBlockState(pos), 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();
}
}
=======
>>>>>>> |
<<<<<<<
Vector3 thisPos = new Vector3(this).translate(0.5F);
Vector3 minPos = new Vector3(thisPos).translate(-distance);
Vector3 maxPos = new Vector3(thisPos).translate(distance);
AxisAlignedBB matchingRegion = new AxisAlignedBB(minPos.x, minPos.y, minPos.z, maxPos.x, maxPos.y, maxPos.z);
List playersWithin = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, matchingRegion);
=======
Vector3 minPos = new Vector3(this).translate(0.5D - distance);
Vector3 maxPos = new Vector3(this).translate(0.5D + distance);
AxisAlignedBB matchingRegion = AxisAlignedBB.fromBounds(minPos.x, minPos.y, minPos.z, maxPos.x, maxPos.y, maxPos.z);
List<EntityPlayer> playersWithin = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, matchingRegion);
>>>>>>>
Vector3 minPos = new Vector3(this).translate(0.5D - distance);
Vector3 maxPos = new Vector3(this).translate(0.5D + distance);
AxisAlignedBB matchingRegion = new AxisAlignedBB(minPos.x, minPos.y, minPos.z, maxPos.x, maxPos.y, maxPos.z);
List<EntityPlayer> playersWithin = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, matchingRegion);
<<<<<<<
BlockPos pos = new BlockPos(x, y, z);
Block blockAt = this.worldObj.getBlockState(pos).getBlock();
if (blockAt.isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj, pos))
>>>>>>>
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
<<<<<<<
BlockPos pos = new BlockPos(x, y, z);
Block blockAt = this.worldObj.getBlockState(pos).getBlock();
if (blockAt.isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj, pos))
>>>>>>>
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
<<<<<<<
BlockPos pos = new BlockPos(x, y, z);
Block blockAt = this.worldObj.getBlockState(pos).getBlock();
if (blockAt.isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj, pos))
>>>>>>>
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock().isAir(this.worldObj.getBlockState(pos), this.worldObj, pos))
<<<<<<<
blockAt = this.worldObj.getBlockState(new BlockPos(x, y, z)).getBlock();
if (blockAt == GCBlocks.airLockSeal)
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal)
>>>>>>>
pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal)
<<<<<<<
blockAt = this.worldObj.getBlockState(new BlockPos(x, y, z)).getBlock();
if (blockAt == GCBlocks.airLockSeal)
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal)
>>>>>>>
pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal)
<<<<<<<
blockAt = this.worldObj.getBlockState(new BlockPos(x, y, z)).getBlock();
if (blockAt == GCBlocks.airLockSeal)
=======
BlockPos pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal)
>>>>>>>
pos = new BlockPos(x, y, z);
if (this.worldObj.getBlockState(pos).getBlock() == GCBlocks.airLockSeal) |
<<<<<<<
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, PlayerInteractionManager interactionManager)
=======
private boolean noClipOverride;
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, ItemInWorldManager itemInWorldManager)
>>>>>>>
private boolean noClipOverride;
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, PlayerInteractionManager interactionManager) |
<<<<<<<
String nameSmelted = this.stacks.get(1).getUnlocalizedName().toLowerCase();
if (resultItemStack.getUnlocalizedName().toLowerCase().contains("ingot") && (nameSmelted.contains("ore") || nameSmelted.contains("raw") || nameSmelted.contains("moon") || nameSmelted.contains("mars") || nameSmelted.contains("shard")))
=======
String nameSmelted = this.containingItems[1].getUnlocalizedName().toLowerCase();
if ((resultItemStack.getUnlocalizedName().toLowerCase().contains("ingot") || resultItemStack.getItem() == Items.QUARTZ) && (nameSmelted.contains("ore") || nameSmelted.contains("raw") || nameSmelted.contains("moon") || nameSmelted.contains("mars") || nameSmelted.contains("shard")))
>>>>>>>
String nameSmelted = this.stacks.get(1).getUnlocalizedName().toLowerCase();
if ((resultItemStack.getUnlocalizedName().toLowerCase().contains("ingot") || resultItemStack.getItem() == Items.QUARTZ) && (nameSmelted.contains("ore") || nameSmelted.contains("raw") || nameSmelted.contains("moon") || nameSmelted.contains("mars") || nameSmelted.contains("shard"))) |
<<<<<<<
=======
import java.lang.reflect.Field;
import java.lang.reflect.Method;
>>>>>>>
import java.lang.reflect.Field;
import java.lang.reflect.Method;
<<<<<<<
=======
registryCached = registry;
Method[] methods = registry.getClass().getMethods();
for (Method m : methods)
{
if (m.getName().equals("addRecipeCatalyst"))
{
JEIversion450plus = true;
break;
}
}
if (!JEIversion450plus)
{
IGuiHelper guiHelper = registry.getJeiHelpers().getGuiHelper();
registry.addRecipeCategories(new Tier1RocketRecipeCategory(guiHelper),
new BuggyRecipeCategory(guiHelper),
new CircuitFabricatorRecipeCategory(guiHelper),
new IngotCompressorRecipeCategory(guiHelper),
new RefineryRecipeCategory(guiHelper));
}
>>>>>>>
registryCached = registry;
<<<<<<<
registry.addRecipeCatalyst(new ItemStack(GCBlocks.nasaWorkbench), RecipeCategories.ROCKET_T1_ID, RecipeCategories.BUGGY_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase2, 1, 4), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase, 1, 12), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.refinery), RecipeCategories.REFINERY_ID);
=======
if (JEIversion450plus)
{
registry.addRecipeCatalyst(new ItemStack(GCBlocks.nasaWorkbench), RecipeCategories.ROCKET_T1_ID, RecipeCategories.BUGGY_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase2, 1, 4), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase, 1, 12), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.refinery), RecipeCategories.REFINERY_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.crafting), VanillaRecipeCategoryUid.CRAFTING);
}
else
{
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.refinery), RecipeCategories.REFINERY_ID); registry.addRecipeCatalyst(new ItemStack(GCBlocks.nasaWorkbench), RecipeCategories.ROCKET_T1_ID, RecipeCategories.BUGGY_ID);
registry.addRecipeCategoryCraftingItem(new ItemStack(GCBlocks.crafting), VanillaRecipeCategoryUid.CRAFTING);
}
>>>>>>>
registry.addRecipeCatalyst(new ItemStack(GCBlocks.nasaWorkbench), RecipeCategories.ROCKET_T1_ID, RecipeCategories.BUGGY_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase2, 1, 4), RecipeCategories.CIRCUIT_FABRICATOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.machineBase, 1, 12), RecipeCategories.INGOT_COMPRESSOR_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.refinery), RecipeCategories.REFINERY_ID);
registry.addRecipeCatalyst(new ItemStack(GCBlocks.crafting), VanillaRecipeCategoryUid.CRAFTING); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.network.IPacketReceiver;
import net.minecraft.client.particle.Particle;
=======
import net.minecraft.client.particle.EntityFX;
>>>>>>>
import net.minecraft.client.particle.Particle; |
<<<<<<<
//No block update on server - not necessary for changing air to air (also must not trigger a sealer edge check!)
Block b = vec.getBlockState(this.world).getBlock();
BlockPos pos = vec.toBlockPos();
=======
BlockPos blockpos = vec.toBlockPos();
Block b = this.worldObj.getBlockState(blockpos).getBlock();
IBlockState newState;
>>>>>>>
BlockPos blockpos = vec.toBlockPos();
Block b = this.world.getBlockState(blockpos).getBlock();
IBlockState newState;
<<<<<<<
this.world.setBlockState(pos, Blocks.AIR.getDefaultState(), (this.world.isRemote) ? 2 : 0);
this.checkLightFor(EnumSkyBlock.BLOCK, pos);
=======
newState = Blocks.AIR.getDefaultState();
>>>>>>>
newState = Blocks.AIR.getDefaultState();
<<<<<<<
this.world.setBlockState(pos, GCBlocks.breatheableAir.getDefaultState(), (this.world.isRemote) ? 2 : 0);
this.checkLightFor(EnumSkyBlock.BLOCK, pos);
=======
newState = GCBlocks.breatheableAir.getDefaultState();
>>>>>>>
newState = GCBlocks.breatheableAir.getDefaultState();
<<<<<<<
if (!this.world.isAreaLoaded(pos, 17, false))
=======
if (!this.worldObj.isAreaLoaded(bp, 17, false))
>>>>>>>
if (!this.world.isAreaLoaded(bp, 17, false))
<<<<<<<
int i = 0;
int index = 0;
int blockLight = this.world.getLightFor(lightType, pos);
int rawLight = this.getRawLight(pos, lightType);
int x = pos.getX() - 32;
int y = pos.getY() - 32;
int z = pos.getZ() - 32;
int opacity;
int range;
int savedLight;
if (rawLight > blockLight) //Light switched on
{
lightUpdateBlockList[index++] = 133152; //32, 32, 32 = the 0 position
}
else if (rawLight < blockLight) //Light switched off ?
{
lightUpdateBlockList[index++] = 133152 | blockLight << 18;
=======
lightUpdateBlockList[index++] = 133152; //32, 32, 32 = the 0 position
}
else if (rawLight < savedLight) //Light switched off ?
{
lightUpdateBlockList[index++] = 133152 | savedLight << 18;
>>>>>>>
lightUpdateBlockList[index++] = 133152; //32, 32, 32 = the 0 position
}
else if (rawLight < savedLight) //Light switched off ?
{
lightUpdateBlockList[index++] = 133152 | savedLight << 18;
<<<<<<<
savedLight = this.world.getLightFor(lightType, vec);
if (savedLight == 0) continue; //eliminate backtracking
IBlockState bs = this.world.getBlockState(vec);
opacity = bs.getBlock().getLightOpacity(bs, this.world, vec);
if (opacity <= 0) opacity = 1;
//Tack positions onto the list as long as it looks like lit from here. i.e. saved light is adjacent light - opacity!
//There will be some errors due to coincidence / equality of light levels from 2 sources
if (savedLight == arraylight - opacity && index < lightUpdateBlockList.length)
{
lightUpdateBlockList[index++] = vec.getX() - x | vec.getY() - y << 6 | vec.getZ() - z << 12 | savedLight << 18;
}
=======
lightUpdateBlockList[index++] = vec.getX() - x + (((savedLight << 6) + vec.getZ() - z << 6) + vec.getY() - y << 6);
>>>>>>>
lightUpdateBlockList[index++] = vec.getX() - x + (((savedLight << 6) + vec.getZ() - z << 6) + vec.getY() - y << 6);
<<<<<<<
IBlockState bs = this.world.getBlockState(pos);
Block block = bs.getBlock();
int blockLight = block.getLightValue(bs, this.world, pos);
int light = lightType == EnumSkyBlock.SKY ? 0 : blockLight;
int opacity = block.getLightOpacity(bs, this.world, pos);
if (opacity >= 15 && blockLight > 0)
{
opacity = 1;
}
=======
int opacity = block.getLightOpacity(bs, this.worldObj, pos);
>>>>>>>
int opacity = block.getLightOpacity(bs, this.world, pos);
<<<<<<<
int otherlight = this.world.getLightFor(lightType, blockpos) - opacity; //Circular reference?
if (otherlight > light)
=======
if (neighbourLight >= 14)
>>>>>>>
if (neighbourLight >= 14) |
<<<<<<<
final float i = entity.getLaunched() ? (5 - MathHelper.floor(entity.timeUntilLaunch / 85)) / 10F : 0.3F;
GL11.glRotatef(MathHelper.sin(var28) * var28 * i * par9, 1.0F, 0.0F, 0.0F);
GL11.glRotatef(MathHelper.sin(var28) * var28 * i * par9, 1.0F, 0.0F, 1.0F);
=======
float i = entity.getLaunched() ? (5 - MathHelper.floor_double(entity.timeUntilLaunch / 85)) / 10F : 0.3F;
GlStateManager.rotate(MathHelper.sin(rollAmplitude) * rollAmplitude * i * partialTicks, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate(MathHelper.sin(rollAmplitude) * rollAmplitude * i * partialTicks, 1.0F, 0.0F, 1.0F);
>>>>>>>
final float i = entity.getLaunched() ? (5 - MathHelper.floor(entity.timeUntilLaunch / 85)) / 10F : 0.3F;
GlStateManager.rotate(MathHelper.sin(rollAmplitude) * rollAmplitude * i * partialTicks, 1.0F, 0.0F, 0.0F);
GlStateManager.rotate(MathHelper.sin(rollAmplitude) * rollAmplitude * i * partialTicks, 1.0F, 0.0F, 1.0F); |
<<<<<<<
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/assembly"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/rocketT1"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggyMain"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggyStorage"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggyWheels"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/flag0"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/frequencyModule"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/oxygen_gas"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/hydrogen_gas"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/bubble"));
=======
event.map.registerSprite(new ResourceLocation("galacticraftcore:blocks/assembly"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/rocket_t1"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/buggy_main"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/buggy_storage"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/buggy_wheels"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/flag0"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:model/frequency_module"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/oxygen_gas"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/hydrogen_gas"));
event.map.registerSprite(new ResourceLocation("galacticraftcore:blocks/bubble"));
>>>>>>>
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/assembly"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/rocket_t1"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggy_main"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggy_storage"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/buggy_wheels"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/flag0"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:model/frequency_module"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/oxygen_gas"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/fluids/hydrogen_gas"));
event.getMap().registerSprite(new ResourceLocation("galacticraftcore:blocks/bubble"));
<<<<<<<
Quat4f rot = TRSRTransformation.quatFromXYZDegrees(new Vector3f(30, 225, 0));
replaceModelDefault(event, "rocket_workbench", "block/workbench.obj", ImmutableList.of("Cube"), ItemModelWorkbench.class, new TRSRTransformation(new javax.vecmath.Vector3f(0.7F, 0.1F, 0.0F), rot, new javax.vecmath.Vector3f(0.2604F, 0.2604F, 0.2604F), new javax.vecmath.Quat4f()));
replaceModelDefault(event, "rocket_t1", "rocketT1.obj", ImmutableList.of("Rocket"), ItemModelRocket.class, TRSRTransformation.identity());
=======
replaceModelDefault(event, "rocket_workbench", "block/workbench.obj", ImmutableList.of("Cube"), ItemModelWorkbench.class, new TRSRTransformation(new javax.vecmath.Vector3f(0.6F, 0.04F, 0.0F), new javax.vecmath.Quat4f(), new javax.vecmath.Vector3f(0.42F, 0.42F, 0.42F), new javax.vecmath.Quat4f()));
replaceModelDefault(event, "rocket_t1", "rocket_t1.obj", ImmutableList.of("Rocket"), ItemModelRocket.class, TRSRTransformation.identity());
>>>>>>>
Quat4f rot = TRSRTransformation.quatFromXYZDegrees(new Vector3f(30, 225, 0));
replaceModelDefault(event, "rocket_workbench", "block/workbench.obj", ImmutableList.of("Cube"), ItemModelWorkbench.class, new TRSRTransformation(new javax.vecmath.Vector3f(0.7F, 0.1F, 0.0F), rot, new javax.vecmath.Vector3f(0.2604F, 0.2604F, 0.2604F), new javax.vecmath.Quat4f()));
replaceModelDefault(event, "rocket_t1", "rocket_t1.obj", ImmutableList.of("Rocket"), ItemModelRocket.class, TRSRTransformation.identity()); |
<<<<<<<
if (name.startsWith("fuel"))
{
return !name.contains("dense") && !name.contains("heavy") && !name.contains("mixed") && !name.contains("gaseous");
}
return false;
=======
return name.equals("refined_fuel"); //from Thermal Expansion
>>>>>>>
if (name.startsWith("fuel"))
{
return !name.contains("dense") && !name.contains("heavy") && !name.contains("mixed") && !name.contains("gaseous");
}
return name.equals("refined_fuel"); //from Thermal Expansion |
<<<<<<<
if (player.world.provider instanceof IGalacticraftWorldProvider && OxygenUtil.shouldDisplayTankGui(minecraft.currentScreen) && OxygenUtil.noAtmosphericCombustion(player.world.provider) && !playerBaseClient.isSpectator())
=======
if (player.worldObj.provider instanceof IGalacticraftWorldProvider && OxygenUtil.shouldDisplayTankGui(minecraft.currentScreen) && OxygenUtil.noAtmosphericCombustion(player.worldObj.provider) && !playerBaseClient.isSpectator() && !minecraft.gameSettings.showDebugInfo)
>>>>>>>
if (player.world.provider instanceof IGalacticraftWorldProvider && OxygenUtil.shouldDisplayTankGui(minecraft.currentScreen) && OxygenUtil.noAtmosphericCombustion(player.world.provider) && !playerBaseClient.isSpectator() && !minecraft.gameSettings.showDebugInfo) |
<<<<<<<
FluidStack liquid = FluidUtil.getFluidContained(var4);
return liquid != null && FluidRegistry.getFluidName(liquid).startsWith("oil");
=======
FluidStack liquid = FluidContainerRegistry.getFluidForFilledItem(var4);
return isOil(liquid);
>>>>>>>
FluidStack liquid = FluidUtil.getFluidContained(var4);
return isOil(liquid); |
<<<<<<<
private static boolean modBOPLoaded;
private static boolean spongeLoaded;
=======
private static boolean modBOPLoaded = Loader.isModLoaded("BiomesOPlenty");
private static boolean wailaLoaded;
public static boolean isMFRLoaded = Loader.isModLoaded("MineFactoryReloaded");
public static boolean isSmartMovingLoaded = Loader.isModLoaded("SmartMoving");
public static boolean isTConstructLoaded = Loader.isModLoaded("tconstruct");
public static boolean isWitcheryLoaded = Loader.isModLoaded("witchery");
>>>>>>>
private static boolean modBOPLoaded = Loader.isModLoaded("BiomesOPlenty");
private static boolean spongeLoaded;
private static boolean wailaLoaded;
public static boolean isMFRLoaded = Loader.isModLoaded("MineFactoryReloaded");
public static boolean isSmartMovingLoaded = Loader.isModLoaded("SmartMoving");
public static boolean isTConstructLoaded = Loader.isModLoaded("tconstruct");
public static boolean isWitcheryLoaded = Loader.isModLoaded("witchery");
<<<<<<<
if (Loader.isModLoaded("sponge"))
{
try {
spongeOverride = Class.forName("org.spongepowered.common.interfaces.world.gen.IMixinChunkProviderServer").getMethod("setForceChunkRequests", boolean.class);
spongeLoaded = true;
} catch (Exception e) { e.printStackTrace(); }
}
=======
if (Loader.isModLoaded("Waila"))
{
CompatibilityManager.wailaLoaded = true;
GCLog.info("Galacticraft: activating WAILA compatibility features.");
}
>>>>>>>
if (Loader.isModLoaded("Waila"))
{
CompatibilityManager.wailaLoaded = true;
GCLog.info("Galacticraft: activating WAILA compatibility features.");
}
if (Loader.isModLoaded("sponge"))
{
try {
spongeOverride = Class.forName("org.spongepowered.common.interfaces.world.gen.IMixinChunkProviderServer").getMethod("setForceChunkRequests", boolean.class);
spongeLoaded = true;
} catch (Exception e) { e.printStackTrace(); }
}
<<<<<<<
public static void spongeOverrideStart(WorldServer w)
{
}
public static void forceLoadChunks(WorldServer w)
{
ChunkProviderServer cps = w.getChunkProvider();
try
{
if (spongeLoaded)
{
spongeOverride.invoke(cps, true);
}
} catch (Exception ignore)
{
}
}
public static void forceLoadChunksEnd(WorldServer w)
{
ChunkProviderServer cps = w.getChunkProvider();
try
{
if (spongeLoaded)
{
spongeOverride.invoke(cps, false);
}
} catch (Exception ignore)
{
}
}
=======
public static boolean isWailaLoaded()
{
return CompatibilityManager.wailaLoaded;
}
>>>>>>>
public static boolean isWailaLoaded()
{
return CompatibilityManager.wailaLoaded;
}
public static void spongeOverrideStart(WorldServer w)
{
}
public static void forceLoadChunks(WorldServer w)
{
ChunkProviderServer cps = w.getChunkProvider();
try
{
if (spongeLoaded)
{
spongeOverride.invoke(cps, true);
}
} catch (Exception ignore)
{
}
}
public static void forceLoadChunksEnd(WorldServer w)
{
ChunkProviderServer cps = w.getChunkProvider();
try
{
if (spongeLoaded)
{
spongeOverride.invoke(cps, false);
}
} catch (Exception ignore)
{
}
} |
<<<<<<<
import net.minecraftforge.common.model.TRSRTransformation;
=======
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.resources.model.IBakedModel;
>>>>>>>
import net.minecraftforge.common.model.TRSRTransformation;
import net.minecraft.client.renderer.texture.TextureAtlasSprite; |
<<<<<<<
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
this.entityDropItem(new ItemStack(GCBlocks.oxygenPipe), 0.0F);
break;
case 6:
//Oxygen tank half empty or less
this.entityDropItem(new ItemStack(GCItems.oxTankMedium, 1, 901 + this.rand.nextInt(900)), 0.0F);
break;
case 7:
case 8:
this.dropItem(GCItems.canister, 1);
break;
default:
if (ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.pumpkin_seeds, 1);
break;
=======
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
this.entityDropItem(new ItemStack(GCBlocks.oxygenPipe), 0.0F);
break;
case 6:
//Oxygen tank half empty or less
this.entityDropItem(new ItemStack(GCItems.oxTankMedium, 1, 901 + this.rand.nextInt(900)), 0.0F);
break;
case 7:
case 8:
this.dropItem(GCItems.canister, 1);
break;
default:
if (ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.pumpkin_seeds, 1);
break;
>>>>>>>
case 0:
case 1:
case 2:
case 3:
case 4:
case 5:
this.entityDropItem(new ItemStack(GCBlocks.oxygenPipe), 0.0F);
break;
case 6:
//Oxygen tank half empty or less
this.entityDropItem(new ItemStack(GCItems.oxTankMedium, 1, 901 + this.rand.nextInt(900)), 0.0F);
break;
case 7:
case 8:
this.dropItem(GCItems.canister, 1);
break;
default:
if (ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.pumpkin_seeds, 1);
break;
<<<<<<<
if (p_70628_1_ && (ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning) && j > 1 && this.rand.nextInt(12) == 0)
this.entityDropItem(new ItemStack(Items.dye, 1, 4), 0.0F);
}
@Override
public void setTumbling(float value)
{
if (value !=0F)
{
if (this.tumbling == 0F)
this.tumbling = (this.worldObj.rand.nextFloat() + 0.5F) * value;
}
else
this.tumbling = 0F;
}
@Override
public void onEntityUpdate()
{
super.onEntityUpdate();
if (!this.isDead)
{
if (this.tumbling != 0F)
{
if (this.onGround)
{
this.tumbling = 0F;
}
}
if (!this.worldObj.isRemote)
{
this.setSpinPitch(this.tumbling);
}
else
{
this.tumbling = this.getSpinPitch();
this.tumbleAngle -= this.tumbling;
if (this.tumbling == 0F && this.tumbleAngle != 0F)
{
this.tumbleAngle *= 0.8F;
if (Math.abs(this.tumbleAngle) < 1F)
this.tumbleAngle = 0F;
}
}
}
}
@Override
protected void entityInit()
{
super.entityInit();
this.dataWatcher.addObject(16, 0.0F);
}
@Override
public void readEntityFromNBT(NBTTagCompound nbt)
{
super.readEntityFromNBT(nbt);
this.tumbling = nbt.getFloat("tumbling");
}
@Override
public void writeEntityToNBT(NBTTagCompound nbt)
{
super.writeEntityToNBT(nbt);
nbt.setFloat("tumbling", this.tumbling);
}
public float getSpinPitch()
{
return this.dataWatcher.getWatchableObjectFloat(16);
=======
if (p_70628_1_ && (ConfigManagerCore.challengeMobDropsAndSpawning) && j > 1 && this.rand.nextInt(12) == 0)
this.entityDropItem(new ItemStack(Items.dye, 1, 4), 0.0F);
>>>>>>>
if (p_70628_1_ && (ConfigManagerCore.challengeMobDropsAndSpawning) && j > 1 && this.rand.nextInt(12) == 0)
this.entityDropItem(new ItemStack(Items.dye, 1, 4), 0.0F);
}
@Override
public void setTumbling(float value)
{
if (value !=0F)
{
if (this.tumbling == 0F)
this.tumbling = (this.worldObj.rand.nextFloat() + 0.5F) * value;
}
else
this.tumbling = 0F;
}
@Override
public void onEntityUpdate()
{
super.onEntityUpdate();
if (!this.isDead)
{
if (this.tumbling != 0F)
{
if (this.onGround)
{
this.tumbling = 0F;
}
}
if (!this.worldObj.isRemote)
{
this.setSpinPitch(this.tumbling);
}
else
{
this.tumbling = this.getSpinPitch();
this.tumbleAngle -= this.tumbling;
if (this.tumbling == 0F && this.tumbleAngle != 0F)
{
this.tumbleAngle *= 0.8F;
if (Math.abs(this.tumbleAngle) < 1F)
this.tumbleAngle = 0F;
}
}
}
}
@Override
protected void entityInit()
{
super.entityInit();
this.dataWatcher.addObject(16, 0.0F);
}
@Override
public void readEntityFromNBT(NBTTagCompound nbt)
{
super.readEntityFromNBT(nbt);
this.tumbling = nbt.getFloat("tumbling");
}
@Override
public void writeEntityToNBT(NBTTagCompound nbt)
{
super.writeEntityToNBT(nbt);
nbt.setFloat("tumbling", this.tumbling);
}
public float getSpinPitch()
{
return this.dataWatcher.getWatchableObjectFloat(16); |
<<<<<<<
this.setBlockBounds(0.175F, 0.0F, 0.175F, 0.825F, 0.75F, 0.825F);
this.setHardness(50.0F);
=======
this.setBlockBounds(0.2F, 0.2F, 0.2F, 0.8F, 0.8F, 0.8F);
this.setHardness(40.0F);
>>>>>>>
this.setBlockBounds(0.175F, 0.0F, 0.175F, 0.825F, 0.75F, 0.825F);
this.setHardness(40.0F); |
<<<<<<<
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProvider, IFluidHandlerWrapper
=======
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProviderColored, IFluidHandler, IFluidHandlerWrapper
>>>>>>>
public class TileEntityTerraformer extends TileBaseElectricBlockWithInventory implements ISidedInventory, IDisableableMachine, IBubbleProviderColored, IFluidHandlerWrapper |
<<<<<<<
private static boolean spongeLoaded;
=======
private static boolean modMatterOverdriveLoaded;
>>>>>>>
private static boolean spongeLoaded;
private static boolean modMatterOverdriveLoaded; |
<<<<<<<
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
=======
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
>>>>>>>
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
<<<<<<<
import micdoodle8.mods.galacticraft.core.tile.TileEntityUniversalElectrical;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; |
<<<<<<<
import net.minecraft.client.Minecraft;
=======
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
>>>>>>>
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
import net.minecraft.client.Minecraft;
<<<<<<<
@SideOnly(Side.CLIENT)
public static double getCameraZoom(double previous)
{
if (ConfigManagerCore.disableVehicleCameraChanges)
{
return previous;
}
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player.getRidingEntity() != null && player.getRidingEntity() instanceof ICameraZoomEntity)
{
return ((ICameraZoomEntity) player.getRidingEntity()).getCameraZoom();
}
return previous;
}
=======
public static double armorDamageHook(EntityLivingBase entity)
{
if (entity instanceof EntityPlayer && GalacticraftCore.isPlanetsLoaded)
{
GCPlayerStats stats = GCPlayerStats.get(entity);
if (stats != null)
{
ItemStack shield = stats.getShieldControllerInSlot();
if (shield != null && shield.getItem() == VenusItems.basicItem && shield.getItemDamage() == 0 && shield.stackSize > 0)
{
return 0D;
}
}
}
return 1D;
}
>>>>>>>
@SideOnly(Side.CLIENT)
public static double getCameraZoom(double previous)
{
if (ConfigManagerCore.disableVehicleCameraChanges)
{
return previous;
}
EntityPlayer player = Minecraft.getMinecraft().thePlayer;
if (player.getRidingEntity() != null && player.getRidingEntity() instanceof ICameraZoomEntity)
{
return ((ICameraZoomEntity) player.getRidingEntity()).getCameraZoom();
}
return previous;
}
public static double armorDamageHook(EntityLivingBase entity)
{
if (entity instanceof EntityPlayer && GalacticraftCore.isPlanetsLoaded)
{
GCPlayerStats stats = GCPlayerStats.get(entity);
if (stats != null)
{
ItemStack shield = stats.getShieldControllerInSlot();
if (shield != null && shield.getItem() == VenusItems.basicItem && shield.getItemDamage() == 0 && shield.stackSize > 0)
{
return 0D;
}
}
}
return 1D;
} |
<<<<<<<
prop.setComment("Dimension ID for Asteroids");
prop.setLanguageKey("gc.configgui.dimensionIDAsteroids").setRequiresMcRestart(true);
=======
prop.comment = "Dimension ID for Asteroids";
prop.setLanguageKey("gc.configgui.dimension_i_d_asteroids").setRequiresMcRestart(true);
>>>>>>>
prop.setComment("Dimension ID for Asteroids");
prop.setLanguageKey("gc.configgui.dimension_i_d_asteroids").setRequiresMcRestart(true);
<<<<<<<
prop.setComment("Schematic ID for Tier 3 Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.idSchematicRocketT3");
=======
prop.comment = "Schematic ID for Tier 3 Rocket, must be unique.";
prop.setLanguageKey("gc.configgui.id_schematic_rocket_t3");
>>>>>>>
prop.setComment("Schematic ID for Tier 3 Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.id_schematic_rocket_t3");
<<<<<<<
prop.setComment("Option to disable Helium gas in Galacticraft (because it will be registered by another mod eg GregTech).");
prop.setLanguageKey("gc.configgui.disableGalacticraftHelium");
=======
prop.comment = "Option to disable Helium gas in Galacticraft (because it will be registered by another mod eg GregTech).";
prop.setLanguageKey("gc.configgui.disable_galacticraft_helium");
>>>>>>>
prop.setComment("Option to disable Helium gas in Galacticraft (because it will be registered by another mod eg GregTech).");
prop.setLanguageKey("gc.configgui.disable_galacticraft_helium");
<<<<<<<
prop.setComment("Maximum number of Astro Miners each player is allowed to have active (default 4).");
prop.setLanguageKey("gc.configgui.astroMinersMax");
=======
prop.comment = "Maximum number of Astro Miners each player is allowed to have active (default 4).";
prop.setLanguageKey("gc.configgui.astro_miners_max");
>>>>>>>
prop.setComment("Maximum number of Astro Miners each player is allowed to have active (default 4).");
prop.setLanguageKey("gc.configgui.astro_miners_max");
<<<<<<<
prop.setComment("Disable Iron Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disableIronGenAsteroids");
=======
prop.comment = "Disable Iron Ore Gen on Asteroids.";
prop.setLanguageKey("gc.configgui.disable_iron_gen_asteroids");
>>>>>>>
prop.setComment("Disable Iron Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disable_iron_gen_asteroids");
<<<<<<<
prop.setComment("Disable Aluminum Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disableAluminumGenAsteroids");
=======
prop.comment = "Disable Aluminum Ore Gen on Asteroids.";
prop.setLanguageKey("gc.configgui.disable_aluminum_gen_asteroids");
>>>>>>>
prop.setComment("Disable Aluminum Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disable_aluminum_gen_asteroids");
<<<<<<<
prop.setComment("Disable Ilmenite Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disableIlmeniteGenAsteroids");
=======
prop.comment = "Disable Ilmenite Ore Gen on Asteroids.";
prop.setLanguageKey("gc.configgui.disable_ilmenite_gen_asteroids");
>>>>>>>
prop.setComment("Disable Ilmenite Ore Gen on Asteroids.");
prop.setLanguageKey("gc.configgui.disable_ilmenite_gen_asteroids"); |
<<<<<<<
ItemStack[] aitemstack = CraftingManager.getInstance().getRemainingItems(this.craftMatrix, this.worldObj);
=======
this.pullOneResultStack();
this.markDirty();
return craftingResult;
}
}
}
return null;
}
private void pullOneResultStack()
{
ItemStack[] aitemstack = CraftingManager.getInstance().func_180303_b(this.craftMatrix, this.worldObj);
>>>>>>>
this.pullOneResultStack();
this.markDirty();
return craftingResult;
}
}
}
return null;
}
private void pullOneResultStack()
{
ItemStack[] aitemstack = CraftingManager.getInstance().getRemainingItems(this.craftMatrix, this.worldObj); |
<<<<<<<
=======
import micdoodle8.mods.galacticraft.api.recipe.CircuitFabricatorRecipes;
import micdoodle8.mods.galacticraft.core.GCBlocks;
>>>>>>>
import micdoodle8.mods.galacticraft.api.recipe.CircuitFabricatorRecipes;
import micdoodle8.mods.galacticraft.core.GCBlocks;
<<<<<<<
=======
OreDictionary.registerOre("waferSolarThin", new ItemStack(VenusItems.basicItem, 1, 6));
ItemStack deshIngot = new ItemStack(MarsItems.marsItemBasic, 1, 2);
ItemStack leadIngot = new ItemStack(VenusItems.basicItem, 1, 1);
// Lead block
RecipeUtil.addBlockRecipe(new ItemStack(VenusBlocks.venusBlock, 1, 12), "ingotLead", new ItemStack(VenusItems.basicItem, 1, 1));
RecipeUtil.addRecipe(new ItemStack(VenusItems.basicItem, 9, 1), new Object[] {"X", 'X', new ItemStack(VenusBlocks.venusBlock, 1, 12)});
>>>>>>>
OreDictionary.registerOre("waferSolarThin", new ItemStack(VenusItems.basicItem, 1, 6));
<<<<<<<
=======
// Atomic Battery
RecipeUtil.addRecipeUpdatable(new ItemStack(VenusItems.atomicBattery, 1, 0), new Object[] { "XXX", "XYX", "XXX", 'X', leadIngot, 'Y', new ItemStack(VenusItems.basicItem, 1, 2) });
//Thermal Fabric T2
RecipeUtil.addRecipeUpdatable(new ItemStack(VenusItems.basicItem, 1, 3), new Object[] { " ", "XYX", " ", 'X', new ItemStack(AsteroidsItems.basicItem, 1, 7), 'Y', deshIngot });
RecipeUtil.addRecipe(new ItemStack(VenusItems.thermalPaddingTier2, 1, 0), new Object[] { "XXX", "X X", 'X', new ItemStack(VenusItems.basicItem, 1, 3) });
RecipeUtil.addRecipe(new ItemStack(VenusItems.thermalPaddingTier2, 1, 1), new Object[] { "X X", "XXX", "XXX", 'X', new ItemStack(VenusItems.basicItem, 1, 3) });
RecipeUtil.addRecipe(new ItemStack(VenusItems.thermalPaddingTier2, 1, 2), new Object[] { "XXX", "X X", "X X", 'X', new ItemStack(VenusItems.basicItem, 1, 3) });
RecipeUtil.addRecipe(new ItemStack(VenusItems.thermalPaddingTier2, 1, 3), new Object[] { "X X", "X X", 'X', new ItemStack(VenusItems.basicItem, 1, 3) });
RecipeUtil.addRecipe(new ItemStack(VenusBlocks.geothermalGenerator, 1, 0), new Object[] { "XVX", "WGW", "XYX", 'X', "compressedBronze", 'Y', new ItemStack(VenusItems.basicItem, 1, 1), 'W', new ItemStack(GCBlocks.aluminumWire), 'V', new ItemStack(AsteroidsItems.atmosphericValve), 'G', new ItemStack(GCBlocks.machineBase, 1, BlockMachine.COAL_GENERATOR_METADATA) } );
// Venus solar module
RecipeUtil.addRecipe(new ItemStack(VenusItems.basicItem, 3, 5), new Object[] { "XXX", "YYY", "ZZZ", 'X', Blocks.GLASS, 'Y', "waferSolarThin", 'Z', new ItemStack(GCBlocks.aluminumWire, 1, 0) });
// Solar Blocks
RecipeUtil.addRecipe(new ItemStack(VenusBlocks.solarArrayModule, 1, 0), new Object[] { "XXX", "YZY", 'X', new ItemStack(VenusItems.basicItem, 3, 5), 'Y', new ItemStack(GCBlocks.aluminumWire, 1, 1), 'Z', "waferAdvanced" });
RecipeUtil.addRecipe(new ItemStack(VenusBlocks.solarArrayController, 1, 0), new Object[] { "X X", "YZY", "XYX", 'X', "compressedSteel", 'Y', new ItemStack(GCBlocks.aluminumWire, 1, 1), 'Z', "waferAdvanced" });
ItemStack solarPanels = new ItemStack(VenusItems.basicItem, 6, 6);
ItemStack silicon = new ItemStack(GCItems.basicItem, 1, 2);
CircuitFabricatorRecipes.addRecipe(solarPanels, Arrays.asList(new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(VenusItems.basicItem, 1, 4)));
>>>>>>>
ItemStack solarPanels = new ItemStack(VenusItems.basicItem, 6, 6);
ItemStack silicon = new ItemStack(GCItems.basicItem, 1, 2);
CircuitFabricatorRecipes.addRecipe(solarPanels, Arrays.asList(new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(VenusItems.basicItem, 1, 4))); |
<<<<<<<
List<EntityPlayer> playersWithin = this.world.getEntitiesWithinAABB(EntityPlayer.class,
new AxisAlignedBB(
this.roomCoords.intX(),
this.roomCoords.intY(),
this.roomCoords.intZ(),
this.roomCoords.intX() + this.roomSize.intX(),
this.roomCoords.intY() + this.roomSize.intY(),
this.roomCoords.intZ() + this.roomSize.intZ()));
=======
List<EntityPlayer> playersWithin = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.spawner.getRangeBounds());
>>>>>>>
List<EntityPlayer> playersWithin = this.world.getEntitiesWithinAABB(EntityPlayer.class, this.spawner.getRangeBounds());
<<<<<<<
List<EntityPlayer> entitiesWithin2 = this.world.getEntitiesWithinAABB(EntityPlayer.class, new AxisAlignedBB(this.roomCoords.intX() - 11, this.roomCoords.intY() - 11, this.roomCoords.intZ() - 11, this.roomCoords.intX() + this.roomSize.intX() + 10, this.roomCoords.intY() + this.roomSize.intY() + 10, this.roomCoords.intZ() + this.roomSize.intZ() + 10));
=======
List<EntityPlayer> entitiesWithin2 = this.worldObj.getEntitiesWithinAABB(EntityPlayer.class, this.spawner.getRangeBoundsPlus11());
>>>>>>>
List<EntityPlayer> entitiesWithin2 = this.world.getEntitiesWithinAABB(EntityPlayer.class, this.spawner.getRangeBoundsPlus11()); |
<<<<<<<
prop.setComment("Should normally be true. If you set this to false, in a modpack with other mods with the same metals, players may be able to craft advanced GC items without travelling to Moon, Mars, Asteroids etc.");
prop.setLanguageKey("gc.configgui.disable_ore_dict_space_metals").setRequiresMcRestart(true);
=======
prop.comment = "Should normally be true. If you set this to false, in a modpack with other mods with any of the space metals (Meteoric Iron, Desh, Titanium etc), players may be able to craft advanced GC items without travelling to Moon, Mars, Asteroids etc.";
prop.setLanguageKey("gc.configgui.disable_ore_dict_space_metals");
>>>>>>>
prop.setComment("Should normally be true. If you set this to false, in a modpack with other mods with the same metals, players may be able to craft advanced GC items without travelling to Moon, Mars, Asteroids etc.");
prop.setLanguageKey("gc.configgui.disable_ore_dict_space_metals"); |
<<<<<<<
final BlockPos vecToAdd = new BlockPos(getPos().getX(), getPos().getY() + y, getPos().getZ());
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.initialised = this.initialiseMultiTiles(this.getPos(), this.worldObj);
>>>>>>>
this.initialised = this.initialiseMultiTiles(this.getPos(), this.world);
<<<<<<<
int buildHeight = this.world.getHeight() - 1;
=======
List<BlockPos> positions = new LinkedList();
this.getPositions(placedPosition, positions);
((BlockMulti) GCBlocks.fakeBlock).makeFakeBlock(world, positions, placedPosition, EnumBlockMultiType.CRYO_CHAMBER);
}
@Override
public void getPositions(BlockPos placedPosition, List<BlockPos> positions)
{
int buildHeight = this.worldObj.getHeight() - 1;
>>>>>>>
List<BlockPos> positions = new LinkedList();
this.getPositions(placedPosition, positions);
((BlockMulti) GCBlocks.fakeBlock).makeFakeBlock(world, positions, placedPosition, EnumBlockMultiType.CRYO_CHAMBER);
}
@Override
public void getPositions(BlockPos placedPosition, List<BlockPos> positions)
{
int buildHeight = this.world.getHeight() - 1;
<<<<<<<
final BlockVec3 thisBlock = new BlockVec3(this);
int fakeBlockCount = 0;
for (int y = 0; y < 3; y++)
{
if (y == 0)
{
continue;
}
if (this.world.getBlockState(new BlockPos(thisBlock.x, thisBlock.y + y, thisBlock.z)).getBlock() == GCBlocks.fakeBlock)
{
fakeBlockCount++;
}
}
=======
final BlockPos thisBlock = getPos();
List<BlockPos> positions = new LinkedList();
this.getPositions(thisBlock, positions);
>>>>>>>
final BlockPos thisBlock = getPos();
List<BlockPos> positions = new LinkedList();
this.getPositions(thisBlock, positions); |
<<<<<<<
return new AxisAlignedBB(getPos().getX() - 1, getPos().getY(), getPos().getZ() - 1, getPos().getX() + 2, getPos().getY() + 4, getPos().getZ() + 2);
=======
return AxisAlignedBB.fromBounds(getPos().getX() - 1, getPos().getY() - 1, getPos().getZ() - 1, getPos().getX() + 2, getPos().getY() + 5, getPos().getZ() + 2);
>>>>>>>
return new AxisAlignedBB(getPos().getX() - 1, getPos().getY() - 1, getPos().getZ() - 1, getPos().getX() + 2, getPos().getY() + 5, getPos().getZ() + 2); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.fluid.OxygenPressureProtocol;
import micdoodle8.mods.galacticraft.core.fluid.ThreadFindSeal;
=======
import micdoodle8.mods.galacticraft.core.energy.tile.EnergyStorageTile;
import micdoodle8.mods.galacticraft.core.items.GCItems;
import micdoodle8.mods.galacticraft.core.oxygen.OxygenPressureProtocol;
import micdoodle8.mods.galacticraft.core.oxygen.ThreadFindSeal;
>>>>>>>
import micdoodle8.mods.galacticraft.core.fluid.OxygenPressureProtocol;
import micdoodle8.mods.galacticraft.core.fluid.ThreadFindSeal;
import micdoodle8.mods.galacticraft.core.energy.tile.EnergyStorageTile;
<<<<<<<
ItemStack oxygenItemStack = this.getStackInSlot(1);
if (oxygenItemStack != null && oxygenItemStack.getItem() instanceof IItemOxygenSupply)
{
IItemOxygenSupply oxygenItem = (IItemOxygenSupply) oxygenItemStack.getItem();
int oxygenDraw = (int) Math.floor(Math.min(this.oxygenPerTick * 2.5F, this.getMaxOxygenStored() - this.getOxygenStored()));
this.setOxygenStored(getOxygenStored() + oxygenItem.discharge(oxygenItemStack, oxygenDraw));
if (this.getOxygenStored() > this.getMaxOxygenStored())
{
this.setOxygenStored(this.getOxygenStored());
}
}
=======
ItemStack oxygenItemStack = this.getStackInSlot(1);
if (oxygenItemStack != null && oxygenItemStack.getItem() instanceof IItemOxygenSupply)
{
IItemOxygenSupply oxygenItem = (IItemOxygenSupply) oxygenItemStack.getItem();
float oxygenDraw = Math.min(UNSEALED_OXYGENPERTICK * 2.5F, this.maxOxygen - this.storedOxygen);
this.storedOxygen += oxygenItem.discharge(oxygenItemStack, oxygenDraw);
if (this.storedOxygen > this.maxOxygen) this.storedOxygen = this.maxOxygen;
}
>>>>>>>
ItemStack oxygenItemStack = this.getStackInSlot(1);
if (oxygenItemStack != null && oxygenItemStack.getItem() instanceof IItemOxygenSupply)
{
IItemOxygenSupply oxygenItem = (IItemOxygenSupply) oxygenItemStack.getItem();
int oxygenDraw = (int) Math.floor(Math.min(UNSEALED_OXYGENPERTICK * 2.5F, this.getMaxOxygenStored() - this.getOxygenStored()));
this.setOxygenStored(getOxygenStored() + oxygenItem.discharge(oxygenItemStack, oxygenDraw));
if (this.getOxygenStored() > this.getMaxOxygenStored())
{
this.setOxygenStored(this.getOxygenStored());
}
}
<<<<<<<
super.update();
=======
this.oxygenPerTick = this.sealed ? 2 : UNSEALED_OXYGENPERTICK;
super.updateEntity();
>>>>>>>
this.oxygenPerTick = this.sealed ? 2 : UNSEALED_OXYGENPERTICK;
super.update(); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
=======
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsCapability;
>>>>>>>
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsCapability;
<<<<<<<
((EntityPlayerMP) entityPlayer).connection.setPlayerLocation(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, entityPlayer.rotationYaw, entityPlayer.rotationPitch);
GalacticraftCore.packetPipeline.sendTo(new PacketSimpleMars(EnumSimplePacketMars.C_BEGIN_CRYOGENIC_SLEEP, entityPlayer.worldObj.provider.getDimension(), new Object[] { this.getPos() }), (EntityPlayerMP) entityPlayer);
=======
((EntityPlayerMP) entityPlayer).playerNetServerHandler.setPlayerLocation(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, entityPlayer.rotationYaw, entityPlayer.rotationPitch);
GalacticraftCore.packetPipeline.sendTo(new PacketSimpleMars(EnumSimplePacketMars.C_BEGIN_CRYOGENIC_SLEEP, GCCoreUtil.getDimensionID(entityPlayer.worldObj), new Object[] { this.getPos() }), (EntityPlayerMP) entityPlayer);
>>>>>>>
((EntityPlayerMP) entityPlayer).connection.setPlayerLocation(entityPlayer.posX, entityPlayer.posY, entityPlayer.posZ, entityPlayer.rotationYaw, entityPlayer.rotationPitch);
GalacticraftCore.packetPipeline.sendTo(new PacketSimpleMars(EnumSimplePacketMars.C_BEGIN_CRYOGENIC_SLEEP, GCCoreUtil.getDimensionID(entityPlayer.worldObj), new Object[] { this.getPos() }), (EntityPlayerMP) entityPlayer);
<<<<<<<
entityPlayer.addChatMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", entityPlayer.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null).getCryogenicChamberCooldown() / 20)));
=======
IStatsCapability stats = entityPlayer.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
entityPlayer.addChatMessage(new ChatComponentText(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", stats.getCryogenicChamberCooldown() / 20)));
>>>>>>>
IStatsCapability stats = entityPlayer.getCapability(CapabilityStatsHandler.GC_STATS_CAPABILITY, null);
entityPlayer.addChatMessage(new TextComponentString(GCCoreUtil.translateWithFormat("gui.cryogenic.chat.cant_use", stats.getCryogenicChamberCooldown() / 20))); |
<<<<<<<
super(par1World, par2, par4, "");
this.world = par1World;
=======
this.worldObj = par1World;
>>>>>>>
this.world = par1World; |
<<<<<<<
import cofh.redstoneflux.api.IEnergyReceiver;
=======
import buildcraft.api.mj.IMjReceiver;
import cofh.api.energy.IEnergyReceiver;
>>>>>>>
import buildcraft.api.mj.IMjReceiver;
import cofh.redstoneflux.api.IEnergyReceiver; |
<<<<<<<
this.stacks.get(i).setCount(this.getInventoryStackLimit());
stack.shrink(this.getInventoryStackLimit() - size);
}
GCCoreUtil.spawnItem(this.world, this.getPos(), stack);
=======
this.containingItems[i].stackSize = this.getInventoryStackLimit();
stack.stackSize -= this.getInventoryStackLimit() - size;
}
GCCoreUtil.spawnItem(this.worldObj, this.getPos(), stack);
>>>>>>>
this.stacks.get(i).setCount(this.getInventoryStackLimit());
stack.shrink(this.getInventoryStackLimit() - size);
}
GCCoreUtil.spawnItem(this.world, this.getPos(), stack);
<<<<<<<
=======
//------------------
//Added these methods and field to implement IMachineSides properly
//------------------
@Override
public MachineSide[] listConfigurableSides()
{
return new MachineSide[] { MachineSide.ELECTRIC_IN };
}
@Override
public Face[] listDefaultFaces()
{
return new Face[] { Face.LEFT };
}
private MachineSidePack[] machineSides;
@Override
public MachineSidePack[] getAllMachineSides()
{
if (this.machineSides == null)
{
this.initialiseSides();
}
return this.machineSides;
}
@Override
public void setupMachineSides(int length)
{
this.machineSides = new MachineSidePack[length];
}
@Override
public void onLoad()
{
this.clientOnLoad();
}
@Override
public IMachineSidesProperties getConfigurationType()
{
return BlockMachine2.MACHINESIDES_RENDERTYPE;
}
//------------------END OF IMachineSides implementation
>>>>>>>
//------------------
//Added these methods and field to implement IMachineSides properly
//------------------
@Override
public MachineSide[] listConfigurableSides()
{
return new MachineSide[] { MachineSide.ELECTRIC_IN };
}
@Override
public Face[] listDefaultFaces()
{
return new Face[] { Face.LEFT };
}
private MachineSidePack[] machineSides;
@Override
public MachineSidePack[] getAllMachineSides()
{
if (this.machineSides == null)
{
this.initialiseSides();
}
return this.machineSides;
}
@Override
public void setupMachineSides(int length)
{
this.machineSides = new MachineSidePack[length];
}
@Override
public void onLoad()
{
this.clientOnLoad();
}
@Override
public IMachineSidesProperties getConfigurationType()
{
return BlockMachine2.MACHINESIDES_RENDERTYPE;
}
//------------------END OF IMachineSides implementation |
<<<<<<<
if (ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.MELON_SEEDS, 1);
=======
if (ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.melon_seeds, 1);
>>>>>>>
if (ConfigManagerCore.challengeMobDropsAndSpawning) this.dropItem(Items.MELON_SEEDS, 1);
<<<<<<<
if (wasRecentlyHit && (ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning) && j > 0 && this.rand.nextInt(6) == 0)
=======
if (p_70628_1_ && (ConfigManagerCore.challengeMobDropsAndSpawning) && j > 0 && this.rand.nextInt(6) == 0)
>>>>>>>
if (wasRecentlyHit && (ConfigManagerCore.challengeMobDropsAndSpawning) && j > 0 && this.rand.nextInt(6) == 0) |
<<<<<<<
if (this.world.isRemote)
{
return;
}
=======
>>>>>>>
<<<<<<<
if (this.world.rand.nextInt(10) == 0)
=======
if (!this.worldObj.isRemote && this.worldObj.rand.nextInt(10) == 0)
>>>>>>>
if (!this.world.isRemote && this.world.rand.nextInt(10) == 0)
<<<<<<<
if (!this.world.isRemote)
{
this.revertAir();
}
=======
this.revertAir();
>>>>>>>
this.revertAir();
<<<<<<<
this.world.setBlockState(vec.toBlockPos(), Blocks.AIR.getDefaultState(), 2);
=======
this.worldObj.setBlockState(vec.toBlockPos(), Blocks.AIR.getDefaultState(), 4);
>>>>>>>
this.world.setBlockState(vec.toBlockPos(), Blocks.AIR.getDefaultState(), 4);
<<<<<<<
this.world.setBlockState(vec.toBlockPos(), GCBlocks.breatheableAir.getDefaultState(), 2);
=======
this.worldObj.setBlockState(vec.toBlockPos(), GCBlocks.breatheableAir.getDefaultState(), 4);
>>>>>>>
this.world.setBlockState(vec.toBlockPos(), GCBlocks.breatheableAir.getDefaultState(), 4); |
<<<<<<<
ItemStack currentStack = player.getHeldItemMainhand();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() >= BlockMachineMars.CRYOGENIC_CHAMBER_METADATA && currentStack.getItemDamage() < BlockMachineMars.LAUNCH_CONTROLLER_METADATA;
=======
ItemStack currentStack = player.getCurrentEquippedItem();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() == BlockMachineMars.CRYOGENIC_CHAMBER_METADATA;
>>>>>>>
ItemStack currentStack = player.getHeldItemMainhand();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() >= BlockMachineMars.CRYOGENIC_CHAMBER_METADATA;
<<<<<<<
ItemStack currentStack = player.getHeldItemMainhand();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() >= BlockMachineMars.CRYOGENIC_CHAMBER_METADATA && currentStack.getItemDamage() < BlockMachineMars.LAUNCH_CONTROLLER_METADATA;
=======
ItemStack currentStack = player.getCurrentEquippedItem();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() == BlockMachineMars.CRYOGENIC_CHAMBER_METADATA;
>>>>>>>
ItemStack currentStack = player.getHeldItemMainhand();
return currentStack != null && this.getBlock() == MarsBlocks.machine && currentStack.getItemDamage() >= BlockMachineMars.CRYOGENIC_CHAMBER_METADATA; |
<<<<<<<
=======
/**
* Fill Galacticraft entities (e.g. rockets, buggies) with Galacticraft fuel.
* For legacy reasons, accepts either "fuel" or "fuelgc".
* Auto-converts either one to the same type of fuel as is already contained.
*
* @param tank The tank
* @param liquid A FluidStack being the fuel offered
* @param doFill True if this is not a simulation / tank capacity test
* @return The amount filled
*/
public static int fillWithGCFuel(FluidTank tank, FluidStack liquid, boolean doFill)
{
if (liquid != null && testFuel(FluidRegistry.getFluidName(liquid)))
{
final FluidStack liquidInTank = tank.getFluid();
//If the tank is empty, fill it with the current type of GC fuel
if (liquidInTank == null)
{
return tank.fill(new FluidStack(GalacticraftCore.fluidFuel, liquid.amount), doFill);
}
//If the tank already contains something, fill it with more of the same
if (liquidInTank.amount < tank.getCapacity())
{
return tank.fill(new FluidStack(liquidInTank, liquid.amount), doFill);
}
}
return 0;
}
>>>>>>> |
<<<<<<<
// @Override
// public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos)
// {
// TileEntity tileEntity = worldIn.getTileEntity(pos);
// TileEntity[] connectable = new TileEntity[6];
//
// if (tileEntity != null)
// {
// IBlockState state = worldIn.getBlockState(pos);
// if (this.getNetworkType(state) != null)
// {
// switch (this.getNetworkType(state))
// {
// case FLUID:
// connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
// break;
// case POWER:
// connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
// break;
// default:
// break;
// }
// }
//
// float minX = 0.0F;
// float minY = 0.32F;
// float minZ = 0.0F;
// float maxX = 1.0F;
// float maxY = 1.0F;
// float maxZ = 1.0F;
//
// if (connectable[0] != null)
// {
// minY = 0.0F;
// }
//
// this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
// }
// }
// private void addCollisionBox(World worldIn, BlockPos pos, AxisAlignedBB aabb, List list)
// {
// AxisAlignedBB mask1 = this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
//
// if (mask1 != null && aabb.intersectsWith(mask1))
// {
// list.add(mask1);
// }
// }
// @Override
// public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
// {
// TileEntity tileEntity = worldIn.getTileEntity(pos);
// TileEntity[] connectable = new TileEntity[6];
//
// if (this.getNetworkType(state) != null)
// {
// switch (this.getNetworkType(state))
// {
// case FLUID:
// connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
// break;
// case POWER:
// connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
// break;
// default:
// break;
// }
// }
//
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
//
// this.setBlockBounds(0.0F, 0.9F, 0.0F, 1.0F, 1.0F, 1.0F);
// this.addCollisionBox(worldIn, pos, mask, list);
//
// if (connectable[4] != null)
// {
// this.setBlockBounds(0, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[5] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, 1, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[0] != null)
// {
// this.setBlockBounds((float) this.minVector.x, 0, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[1] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, 1, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[2] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, 0, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[3] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, 1);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
// }
=======
@Override
public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos)
{
TileEntity tileEntity = worldIn.getTileEntity(pos);
TileEntity[] connectable = new TileEntity[6];
IBlockState state = worldIn.getBlockState(pos);
if (tileEntity != null && state.getBlock() instanceof BlockWalkway)
{
if (this.getNetworkType(state) != null)
{
switch (this.getNetworkType(state))
{
case FLUID:
connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
break;
case POWER:
connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
break;
default:
break;
}
}
float minX = 0.0F;
float minY = 0.32F;
float minZ = 0.0F;
float maxX = 1.0F;
float maxY = 1.0F;
float maxZ = 1.0F;
if (connectable[0] != null)
{
minY = 0.0F;
}
this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
}
}
private void addCollisionBox(World worldIn, BlockPos pos, AxisAlignedBB aabb, List<AxisAlignedBB> list)
{
AxisAlignedBB mask1 = this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
if (mask1 != null && aabb.intersectsWith(mask1))
{
list.add(mask1);
}
}
@Override
public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
{
TileEntity tileEntity = worldIn.getTileEntity(pos);
TileEntity[] connectable = new TileEntity[6];
if (this.getNetworkType(state) != null)
{
switch (this.getNetworkType(state))
{
case FLUID:
connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
break;
case POWER:
connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
break;
default:
break;
}
}
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
this.setBlockBounds(0.0F, 0.9F, 0.0F, 1.0F, 1.0F, 1.0F);
this.addCollisionBox(worldIn, pos, mask, list);
if (connectable[4] != null)
{
this.setBlockBounds(0, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
}
if (connectable[5] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, 1, (float) this.maxVector.y, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
}
if (connectable[0] != null)
{
this.setBlockBounds((float) this.minVector.x, 0, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
}
if (connectable[1] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, 1, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
}
if (connectable[2] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, 0, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
this.addCollisionBox(worldIn, pos, mask, list);
}
if (connectable[3] != null)
{
this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, 1);
this.addCollisionBox(worldIn, pos, mask, list);
}
this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
}
>>>>>>>
// @Override
// public void setBlockBoundsBasedOnState(IBlockAccess worldIn, BlockPos pos)
// {
// TileEntity tileEntity = worldIn.getTileEntity(pos);
// TileEntity[] connectable = new TileEntity[6];
//
// if (tileEntity != null)
// {
// IBlockState state = worldIn.getBlockState(pos);
// if (this.getNetworkType(state) != null)
// {
// switch (this.getNetworkType(state))
// {
// case FLUID:
// connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
// break;
// case POWER:
// connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
// break;
// default:
// break;
// }
// }
//
// float minX = 0.0F;
// float minY = 0.32F;
// float minZ = 0.0F;
// float maxX = 1.0F;
// float maxY = 1.0F;
// float maxZ = 1.0F;
//
// if (connectable[0] != null)
// {
// minY = 0.0F;
// }
//
// this.setBlockBounds(minX, minY, minZ, maxX, maxY, maxZ);
// }
// }
// private void addCollisionBox(World worldIn, BlockPos pos, AxisAlignedBB aabb, List list)
// {
// AxisAlignedBB mask1 = this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
//
// if (mask1 != null && aabb.intersectsWith(mask1))
// {
// list.add(mask1);
// }
// }
// @Override
// public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List<AxisAlignedBB> list, Entity collidingEntity)
// {
// TileEntity tileEntity = worldIn.getTileEntity(pos);
// TileEntity[] connectable = new TileEntity[6];
//
// if (this.getNetworkType(state) != null)
// {
// switch (this.getNetworkType(state))
// {
// case FLUID:
// connectable = OxygenUtil.getAdjacentFluidConnections(tileEntity);
// break;
// case POWER:
// connectable = EnergyUtil.getAdjacentPowerConnections(tileEntity);
// break;
// default:
// break;
// }
// }
//
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
//
// this.setBlockBounds(0.0F, 0.9F, 0.0F, 1.0F, 1.0F, 1.0F);
// this.addCollisionBox(worldIn, pos, mask, list);
//
// if (connectable[4] != null)
// {
// this.setBlockBounds(0, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[5] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, 1, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[0] != null)
// {
// this.setBlockBounds((float) this.minVector.x, 0, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[1] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, 1, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[2] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, 0, (float) this.maxVector.x, (float) this.maxVector.y, (float) this.maxVector.z);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// if (connectable[3] != null)
// {
// this.setBlockBounds((float) this.minVector.x, (float) this.minVector.y, (float) this.minVector.z, (float) this.maxVector.x, (float) this.maxVector.y, 1);
// this.addCollisionBox(worldIn, pos, mask, list);
// }
//
// this.setBlockBounds(0.0F, 0.0F, 0.0F, 1.0F, 1.0F, 1.0F);
// } |
<<<<<<<
if (player.getRidingEntity() instanceof EntityTieredRocket && player == Minecraft.getMinecraft().player
=======
if (player.getRidingEntity() instanceof ICameraZoomEntity && player == Minecraft.getMinecraft().thePlayer
>>>>>>>
if (player.getRidingEntity() instanceof ICameraZoomEntity && player == Minecraft.getMinecraft().player |
<<<<<<<
import net.minecraft.client.renderer.block.model.IBakedModel;
=======
import net.minecraft.client.renderer.culling.ICamera;
>>>>>>>
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.culling.ICamera;
<<<<<<<
=======
import net.minecraftforge.client.model.IFlexibleBakedModel;
>>>>>>>
import net.minecraft.util.math.AxisAlignedBB; |
<<<<<<<
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(EnumSimplePacket.S_OPEN_SCHEMATIC_PAGE, FMLClientHandler.instance().getClient().theWorld.provider.getDimension(), new Object[] { page.getPageID() }));
FMLClientHandler.instance().getClient().thePlayer.openGui(GalacticraftCore.instance, page.getGuiID(), FMLClientHandler.instance().getClient().thePlayer.worldObj, (int) FMLClientHandler.instance().getClient().thePlayer.posX, (int) FMLClientHandler.instance().getClient().thePlayer.posY, (int) FMLClientHandler.instance().getClient().thePlayer.posZ);
=======
GuiScreen cs = event.currentGui;
int benchX = (int) FMLClientHandler.instance().getClient().thePlayer.posX;
int benchY = (int) FMLClientHandler.instance().getClient().thePlayer.posY;
int benchZ = (int) FMLClientHandler.instance().getClient().thePlayer.posZ;
if (cs instanceof GuiPositionedContainer)
{
benchX = ((GuiPositionedContainer)cs).getX();
benchY = ((GuiPositionedContainer)cs).getY();
benchZ = ((GuiPositionedContainer)cs).getZ();
}
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(EnumSimplePacket.S_OPEN_SCHEMATIC_PAGE, FMLClientHandler.instance().getClient().theWorld.provider.getDimensionId(), new Object[] { page.getPageID(), benchX, benchY, benchZ }));
FMLClientHandler.instance().getClient().thePlayer.openGui(GalacticraftCore.instance, page.getGuiID(), FMLClientHandler.instance().getClient().thePlayer.worldObj, benchX, benchY, benchZ);
>>>>>>>
GuiScreen cs = event.currentGui;
int benchX = (int) FMLClientHandler.instance().getClient().thePlayer.posX;
int benchY = (int) FMLClientHandler.instance().getClient().thePlayer.posY;
int benchZ = (int) FMLClientHandler.instance().getClient().thePlayer.posZ;
if (cs instanceof GuiPositionedContainer)
{
benchX = ((GuiPositionedContainer)cs).getX();
benchY = ((GuiPositionedContainer)cs).getY();
benchZ = ((GuiPositionedContainer)cs).getZ();
}
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(EnumSimplePacket.S_OPEN_SCHEMATIC_PAGE, FMLClientHandler.instance().getClient().theWorld.provider.getDimension(), new Object[] { page.getPageID(), benchX, benchY, benchZ }));
FMLClientHandler.instance().getClient().thePlayer.openGui(GalacticraftCore.instance, page.getGuiID(), FMLClientHandler.instance().getClient().thePlayer.worldObj, benchX, benchY, benchZ); |
<<<<<<<
final HashMap<Integer, Integer> idList = new HashMap<Integer, Integer>();
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().player, false);
=======
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().thePlayer, false);
>>>>>>>
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().player, false);
<<<<<<<
final HashMap<Integer, Integer> idList = new HashMap<Integer, Integer>();
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().player, false);
=======
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().thePlayer, false);
>>>>>>>
EntityPlayerSP player = PlayerUtil.getPlayerBaseClientFromPlayer(FMLClientHandler.instance().getClient().player, false); |
<<<<<<<
public class TileEntityElectricFurnace extends TileBaseElectricBlockWithInventory implements ISidedInventory, IPacketReceiver, IMachineSides
=======
public class TileEntityElectricFurnace extends TileBaseElectricBlockWithInventory implements ISidedInventory
>>>>>>>
public class TileEntityElectricFurnace extends TileBaseElectricBlockWithInventory implements ISidedInventory, IMachineSides |
<<<<<<<
import net.minecraft.world.gen.ChunkGeneratorOverworld;
=======
>>>>>>>
<<<<<<<
public class ChunkProviderMoon extends ChunkGeneratorOverworld
=======
public class ChunkProviderMoon extends ChunkProviderBase
>>>>>>>
public class ChunkProviderMoon extends ChunkProviderBase |
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumPickaxe, 1), new Object[] { "YYY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { "YY ", "YX ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { " YY", " XY", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { " YY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { "YY ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumSpade, 1), new Object[] { " Y ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipe(new ItemStack(AsteroidsItems.titaniumSword, 1), new Object[] { " Y ", " Y ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
=======
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumPickaxe, 1), new Object[] { "YYY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { "YY ", "YX ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { " YY", " XY", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { " YY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { "YY ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumSpade, 1), new Object[] { " Y ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumSword, 1), new Object[] { " Y ", " Y ", " X ", 'Y', titaniumPlate, 'X', Items.iron_ingot });
>>>>>>>
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumPickaxe, 1), new Object[] { "YYY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { "YY ", "YX ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumAxe, 1), new Object[] { " YY", " XY", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { " YY", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumHoe, 1), new Object[] { "YY ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumSpade, 1), new Object[] { " Y ", " X ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidsItems.titaniumSword, 1), new Object[] { " Y ", " Y ", " X ", 'Y', titaniumPlate, 'X', Items.IRON_INGOT });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.shortRangeTelepad), new Object[] { "XWX", "ZYZ", "XXX", 'W', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'X', titaniumPlate, 'Y', Items.REDSTONE, 'Z', Items.ENDER_PEARL });
=======
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.shortRangeTelepad), new Object[] { "XWX", "ZYZ", "XXX", 'W', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'X', titaniumPlate, 'Y', Items.redstone, 'Z', Items.ender_pearl });
>>>>>>>
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.shortRangeTelepad), new Object[] { "XWX", "ZYZ", "XXX", 'W', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'X', titaniumPlate, 'Y', Items.REDSTONE, 'Z', Items.ENDER_PEARL });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.beamReceiver), new Object[] { " X ", "XYX", " X ", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8) });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", "ZX ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.LEVER });
RecipeUtil.addRecipe(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", " XZ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.LEVER });
=======
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReceiver), new Object[] { " X ", "XYX", " X ", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8) });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", "ZX ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.lever });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", " XZ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.lever });
>>>>>>>
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReceiver), new Object[] { " X ", "XYX", " X ", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8) });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", "ZX ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.LEVER });
RecipeUtil.addRecipeUpdatable(new ItemStack(AsteroidBlocks.beamReflector), new Object[] { " Y ", " XZ", "XXX", 'X', titaniumPlate, 'Y', new ItemStack(AsteroidsItems.basicItem, 1, 8), 'Z', Blocks.LEVER }); |
<<<<<<<
CraftingManager.getInstance().addShapelessRecipe(new ItemStack(GCItems.parachute, 1, ItemParaChute.getParachuteDamageValueFromDye(var2)), new Object[] { new ItemStack(Items.DYE, 1, var2), new ItemStack(GCItems.parachute, 1, 0) });
=======
RecipeUtil.addShapelessRecipe(new ItemStack(GCItems.parachute, 1, ItemParaChute.getParachuteDamageValueFromDye(var2)), new Object[] { new ItemStack(Items.dye, 1, var2), new ItemStack(GCItems.parachute, 1, 0) });
>>>>>>>
RecipeUtil.addShapelessRecipe(new ItemStack(GCItems.parachute, 1, ItemParaChute.getParachuteDamageValueFromDye(var2)), new Object[] { new ItemStack(Items.DYE, 1, var2), new ItemStack(GCItems.parachute, 1, 0) });
<<<<<<<
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), Blocks.CRAFTING_TABLE, "compressedIron"));
=======
RecipeUtil.addShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), new Object[] { Blocks.crafting_table, "compressedIron" });
>>>>>>>
RecipeUtil.addShapelessOreRecipe(new ItemStack(GCBlocks.crafting, 1), Blocks.CRAFTING_TABLE, "compressedIron");
<<<<<<<
CraftingManager.getInstance().getRecipeList().add(new ShapelessOreRecipe(new ItemStack(GCItems.prelaunchChecklist), new Object[] { new ItemStack(Items.DYE, 1, 1), GCItems.canvas }));
=======
RecipeUtil.addShapelessOreRecipe(new ItemStack(GCItems.prelaunchChecklist), new Object[] { new ItemStack(Items.dye, 1, 1), GCItems.canvas });
>>>>>>>
RecipeUtil.addShapelessOreRecipe(new ItemStack(GCItems.prelaunchChecklist), new Object[] { new ItemStack(Items.DYE, 1, 1), GCItems.canvas }); |
<<<<<<<
import net.minecraft.util.math.BlockPos;
import net.minecraftforge.fml.client.FMLClientHandler;
=======
import net.minecraft.util.BlockPos;
>>>>>>>
import net.minecraft.util.math.BlockPos; |
<<<<<<<
WorldServer worldserver = server.worldServerForDimension(server.worldServers[0].provider.getDimension());
=======
MinecraftServer server = MinecraftServer.getServer();
WorldServer worldserver = server.worldServerForDimension(GCCoreUtil.getDimensionID(server.worldServers[0]));
>>>>>>>
WorldServer worldserver = server.worldServerForDimension(GCCoreUtil.getDimensionID(server.worldServers[0])); |
<<<<<<<
boolean canCreateStations = PermissionAPI.hasPermission(player, Constants.PERMISSION_CREATE_STATION);
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_DIMENSION_LIST, GCCoreUtil.getDimensionID(player.world), new Object[] { player.getGameProfile().getName(), temp, canCreateStations }), player);
=======
boolean canCreateStations = PermissionAPI.hasPermission(player, Constants.PERMISSION_CREATE_STATION);
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_DIMENSION_LIST, GCCoreUtil.getDimensionID(player.worldObj), new Object[] { PlayerUtil.getName(player), temp, canCreateStations }), player);
>>>>>>>
boolean canCreateStations = PermissionAPI.hasPermission(player, Constants.PERMISSION_CREATE_STATION);
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_UPDATE_DIMENSION_LIST, GCCoreUtil.getDimensionID(player.world), new Object[] { PlayerUtil.getName(player), temp, canCreateStations }), player);
<<<<<<<
final float f1 = stats.getTankInSlot1().isEmpty() ? 0.0F : stats.getTankInSlot1().getMaxDamage() / 90.0F;
final float f2 = stats.getTankInSlot2().isEmpty() ? 0.0F : stats.getTankInSlot2().getMaxDamage() / 90.0F;
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_AIR_REMAINING, GCCoreUtil.getDimensionID(player.world), new Object[] { MathHelper.floor(stats.getAirRemaining() / f1), MathHelper.floor(stats.getAirRemaining2() / f2), player.getGameProfile().getName() }), player);
=======
final float f1 = stats.getTankInSlot1() == null ? 0.0F : stats.getTankInSlot1().getMaxDamage() / 90.0F;
final float f2 = stats.getTankInSlot2() == null ? 0.0F : stats.getTankInSlot2().getMaxDamage() / 90.0F;
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_AIR_REMAINING, GCCoreUtil.getDimensionID(player.worldObj), new Object[] { MathHelper.floor_float(stats.getAirRemaining() / f1), MathHelper.floor_float(stats.getAirRemaining2() / f2), PlayerUtil.getName(player) }), player);
>>>>>>>
final float f1 = stats.getTankInSlot1().isEmpty() ? 0.0F : stats.getTankInSlot1().getMaxDamage() / 90.0F;
final float f2 = stats.getTankInSlot2().isEmpty() ? 0.0F : stats.getTankInSlot2().getMaxDamage() / 90.0F;
GalacticraftCore.packetPipeline.sendTo(new PacketSimple(EnumSimplePacket.C_AIR_REMAINING, GCCoreUtil.getDimensionID(player.world), new Object[] { MathHelper.floor(stats.getAirRemaining() / f1), MathHelper.floor(stats.getAirRemaining2() / f2), PlayerUtil.getName(player) }), player);
<<<<<<<
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_UPDATE_GEAR_SLOT, GCCoreUtil.getDimensionID(player.world), new Object[] { player.getGameProfile().getName(), packetType.ordinal(), gearType.ordinal(), gearID }), new TargetPoint(GCCoreUtil.getDimensionID(player.world), player.posX, player.posY, player.posZ, 50.0D));
=======
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_UPDATE_GEAR_SLOT, GCCoreUtil.getDimensionID(player.worldObj), new Object[] { PlayerUtil.getName(player), packetType.ordinal(), gearType.ordinal(), gearID }), new TargetPoint(GCCoreUtil.getDimensionID(player.worldObj), player.posX, player.posY, player.posZ, 50.0D));
>>>>>>>
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_UPDATE_GEAR_SLOT, GCCoreUtil.getDimensionID(player.world), new Object[] { PlayerUtil.getName(player), packetType.ordinal(), gearType.ordinal(), gearID }), new TargetPoint(GCCoreUtil.getDimensionID(player.world), player.posX, player.posY, player.posZ, 50.0D)); |
<<<<<<<
if (!theCurrentItem.isEmpty())
=======
ItemStack offHandItem = player.getHeldItemOffhand();
if (theCurrentItem != null)
>>>>>>>
ItemStack offHandItem = player.getHeldItemOffhand();
if (!theCurrentItem.isEmpty()) |
<<<<<<<
World world = FMLCommonHandler.instance().getMinecraftServerInstance().worldServerForDimension(0);
TickHandlerServer.spaceRaceData = (WorldDataSpaceRaces) world.getMapStorage().getOrLoadData(WorldDataSpaceRaces.class, WorldDataSpaceRaces.saveDataID);
=======
World world = server.worldServerForDimension(0);
TickHandlerServer.spaceRaceData = (WorldDataSpaceRaces) world.getMapStorage().loadData(WorldDataSpaceRaces.class, WorldDataSpaceRaces.saveDataID);
>>>>>>>
World world = server.worldServerForDimension(0);
TickHandlerServer.spaceRaceData = (WorldDataSpaceRaces) world.getMapStorage().getOrLoadData(WorldDataSpaceRaces.class, WorldDataSpaceRaces.saveDataID); |
<<<<<<<
private NonNullList<ItemStack> stacks = NonNullList.withSize(6, ItemStack.EMPTY);
=======
private ItemStack[] containingItems = new ItemStack[6];
private boolean hasCoreToDrop;
>>>>>>>
private NonNullList<ItemStack> stacks = NonNullList.withSize(6, ItemStack.EMPTY);
private boolean hasCoreToDrop;
<<<<<<<
ItemStackHelper.saveAllItems(nbt, this.stacks);
=======
nbt.setBoolean("ctd", this.hasCoreToDrop);
final NBTTagList list = new NBTTagList();
for (int i = 0; i < this.containingItems.length; ++i)
{
if (this.containingItems[i] != null)
{
final NBTTagCompound tagAt = new NBTTagCompound();
tagAt.setByte("Slot", (byte) i);
this.containingItems[i].writeToNBT(tagAt);
list.appendTag(tagAt);
}
}
nbt.setTag("Items", list);
>>>>>>>
ItemStackHelper.saveAllItems(nbt, this.stacks);
nbt.setBoolean("ctd", this.hasCoreToDrop); |
<<<<<<<
if (FluidUtil.tryEmptyCanister(container, fluidHandler) != null || FluidUtil.tryFillCanister(container, fluidHandler) != null)
=======
if ((result = FluidUtil.tryEmptyCanister(container, tank, side, playerIn.capabilities.isCreativeMode)) != null || (result = FluidUtil.tryFillCanister(container, tank, side, playerIn.capabilities.isCreativeMode)) != null)
>>>>>>>
if (FluidUtil.tryEmptyCanister(container, fluidHandler, player.capabilities.isCreativeMode) != null || FluidUtil.tryFillCanister(container, fluidHandler, player.capabilities.isCreativeMode) != null)
<<<<<<<
private static ItemStack tryFillCanister(ItemStack canister, IFluidHandler tank)
=======
private static ItemStack tryFillCanister(ItemStack canister, TileEntityFluidTank tank, EnumFacing side, boolean isCreativeMode)
>>>>>>>
private static ItemStack tryFillCanister(ItemStack canister, IFluidHandler tank, boolean isCreativeMode)
<<<<<<<
FluidStack liquid = tank.drain(currCapacity, false);
int transferred = ((ItemCanisterGeneric)canister.getItem()).fill(canister, liquid, true);
=======
FluidStack liquid = tank.drain(side, currCapacity, false);
int transferred = ((ItemCanisterGeneric)canister.getItem()).fill(canister, liquid, !isCreativeMode);
>>>>>>>
FluidStack liquid = tank.drain(currCapacity, false);
int transferred = ((ItemCanisterGeneric)canister.getItem()).fill(canister, liquid, !isCreativeMode);
<<<<<<<
private static ItemStack tryEmptyCanister(ItemStack canister, IFluidHandler tank)
=======
private static ItemStack tryEmptyCanister(ItemStack canister, TileEntityFluidTank tank, EnumFacing side, boolean isCreativeMode)
>>>>>>>
private static ItemStack tryEmptyCanister(ItemStack canister, IFluidHandler tank, boolean isCreativeMode)
<<<<<<<
((ItemCanisterGeneric)canister.getItem()).drain(canister, transferred, true);
=======
((ItemFluidContainer)canister.getItem()).drain(canister, transferred, !isCreativeMode);
>>>>>>>
((ItemCanisterGeneric)canister.getItem()).drain(canister, transferred, !isCreativeMode); |
<<<<<<<
if (playerBaseClient != null && player.world.provider instanceof IGalacticraftWorldProvider && !stats.isOxygenSetupValid() && OxygenUtil.noAtmosphericCombustion(player.world.provider) && minecraft.currentScreen == null && !playerBaseClient.capabilities.isCreativeMode && !playerBaseClient.isSpectator())
=======
if (playerBaseClient != null && player.worldObj.provider instanceof IGalacticraftWorldProvider && !stats.isOxygenSetupValid() && OxygenUtil.noAtmosphericCombustion(player.worldObj.provider) && minecraft.currentScreen == null && !minecraft.gameSettings.hideGUI && !playerBaseClient.capabilities.isCreativeMode && !playerBaseClient.isSpectator())
>>>>>>>
if (playerBaseClient != null && player.world.provider instanceof IGalacticraftWorldProvider && !stats.isOxygenSetupValid() && OxygenUtil.noAtmosphericCombustion(player.world.provider) && minecraft.currentScreen == null && !minecraft.gameSettings.hideGUI && !playerBaseClient.capabilities.isCreativeMode && !playerBaseClient.isSpectator()) |
<<<<<<<
this.readMachineSidesFromNBT(nbt);
=======
this.readMachineSidesFromNBT(par1NBTTagCompound); //Needed by IMachineSides
>>>>>>>
this.readMachineSidesFromNBT(nbt); //Needed by IMachineSides
<<<<<<<
super.writeToNBT(nbt);
NBTTagList var2 = new NBTTagList();
=======
super.writeToNBT(par1NBTTagCompound);
>>>>>>>
super.writeToNBT(nbt);
<<<<<<<
nbt.setTag("Items", var2);
this.addMachineSidesToNBT(nbt);
return nbt;
=======
par1NBTTagCompound.setTag("Items", var2);
this.addMachineSidesToNBT(par1NBTTagCompound); //Needed by IMachineSides
>>>>>>>
nbt.setTag("Items", var2);
this.addMachineSidesToNBT(nbt); //Needed by IMachineSides
return nbt; |
<<<<<<<
public static Item.ToolMaterial TOOL_TITANIUM = EnumHelper.addToolMaterial("titanium", 4, 760, 10.0F, 4.0F, 12);
public static ItemArmor.ArmorMaterial ARMOR_TITANIUM = EnumHelper.addArmorMaterial("titanium", "", 26, new int[] { 5, 7, 10, 5 }, 12, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F);
=======
public static Item.ToolMaterial TOOL_TITANIUM = EnumHelper.addToolMaterial("titanium", 4, 760, 14.0F, 3.0F, 12);
public static ItemArmor.ArmorMaterial ARMOR_TITANIUM = EnumHelper.addArmorMaterial("titanium", "", 26, new int[] { 5, 10, 7, 5 }, 12);
>>>>>>>
public static Item.ToolMaterial TOOL_TITANIUM = EnumHelper.addToolMaterial("titanium", 4, 760, 14.0F, 4.0F, 12);
public static ItemArmor.ArmorMaterial ARMOR_TITANIUM = EnumHelper.addArmorMaterial("titanium", "", 26, new int[] { 5, 7, 10, 5 }, 12, SoundEvents.ITEM_ARMOR_EQUIP_IRON, 0.0F); |
<<<<<<<
worldNew.spawnEntity(ridingRocket);
=======
CompatibilityManager.forceLoadChunks((WorldServer) worldNew);
ridingRocket.forceSpawn = true;
worldNew.spawnEntityInWorld(ridingRocket);
>>>>>>>
CompatibilityManager.forceLoadChunks((WorldServer) worldNew);
ridingRocket.forceSpawn = true;
worldNew.spawnEntity(ridingRocket);
<<<<<<<
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getPos();
=======
CompatibilityManager.forceLoadChunks(worldNew);
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getChunkCoordIntPair();
>>>>>>>
CompatibilityManager.forceLoadChunks(worldNew);
ChunkPos pair = worldNew.getChunkFromChunkCoords(spawnPos.intX(), spawnPos.intZ()).getPos();
<<<<<<<
worldNew.spawnEntity(entity);
=======
((WorldServer) entity.worldObj).getEntityTracker().untrackEntity(entity);
entity.forceSpawn = true;
worldNew.spawnEntityInWorld(entity);
>>>>>>>
((WorldServer) entity.world).getEntityTracker().untrack(entity);
entity.forceSpawn = true;
worldNew.spawnEntity(entity); |
<<<<<<<
GalacticraftCore.packetPipeline.sendToServer(new PacketSimple(EnumSimplePacket.S_UPDATE_VIEWSCREEN_REQUEST, GCCoreUtil.getDimensionID(this.world), new Object[] { this.getPos() }));
=======
>>>>>>>
<<<<<<<
GalacticraftCore.packetPipeline.sendToDimension(new PacketSimple(EnumSimplePacket.C_UPDATE_VIEWSCREEN, GCCoreUtil.getDimensionID(this.world), new Object[] { this.getPos(), this.imageType, connectedFlags }), GCCoreUtil.getDimensionID(this.world));
=======
data[1] = connectedFlags;
>>>>>>>
data[1] = connectedFlags; |
<<<<<<<
=======
import net.minecraft.tileentity.TileEntityBrewingStand;
import net.minecraft.util.BlockPos;
>>>>>>>
import net.minecraft.tileentity.TileEntityBrewingStand;
<<<<<<<
IBlockState state = Blocks.AIR.getDefaultState();
=======
IBlockState state = Blocks.air.getDefaultState();
int semirand = ((blockpos.getY() * 379 + blockpos.getX()) * 373 + blockpos.getZ()) * 7 & 15;
>>>>>>>
IBlockState state = Blocks.AIR.getDefaultState();
int semirand = ((blockpos.getY() * 379 + blockpos.getX()) * 373 + blockpos.getZ()) * 7 & 15;
<<<<<<<
MEDICAL(Blocks.IRON_TRAPDOOR.getDefaultState(), Blocks.IRON_TRAPDOOR.getStateFromMeta(8), false),
CRYO(AsteroidBlocks.blockBasic.getStateFromMeta(6), AsteroidBlocks.blockBasic.getStateFromMeta(6), true),
=======
POWER(null, null, false),
STORE(null, null, false),
EMPTY(null, null, false),
MEDICAL(Blocks.iron_trapdoor.getDefaultState(), Blocks.iron_trapdoor.getStateFromMeta(8), false),
>>>>>>>
POWER(null, null, false),
STORE(null, null, false),
EMPTY(null, null, false),
MEDICAL(Blocks.IRON_TRAPDOOR.getDefaultState(), Blocks.IRON_TRAPDOOR.getStateFromMeta(8), false), |
<<<<<<<
assists.add(new AssistPercentToFormat());
=======
// assists.add(new AssistOverride()); -- Not ready!
>>>>>>>
assists.add(new AssistPercentToFormat());
// assists.add(new AssistOverride()); -- Not ready! |
<<<<<<<
blockpos = event.pos.add(event.rand.nextInt(16), event.rand.nextInt(104) + 24, event.rand.nextInt(16));
this.eggGenerator.generate(event.world, event.rand, blockpos);
=======
blockpos = event.pos.add(event.rand.nextInt(16) + 8, event.rand.nextInt(104) + 24, event.rand.nextInt(16) + 8);
this.eggGenerator.generate(event.worldObj, event.rand, blockpos);
>>>>>>>
blockpos = event.pos.add(event.rand.nextInt(16) + 8, event.rand.nextInt(104) + 24, event.rand.nextInt(16) + 8);
this.eggGenerator.generate(event.world, event.rand, blockpos); |
<<<<<<<
RecipeUtil.addRecipeUpdatable(new ItemStack(MarsItems.marsItemBasic, 1, 6), new Object[] { "MXM", "SWS", "MXM", 'S', Items.SLIME_BALL, 'X', GCItems.oxygenFan, 'M', meteoricIronIngot, 'W', new ItemStack(GCItems.basicItem, 1, 14) });
=======
RecipeUtil.addRecipeUpdatable(new ItemStack(MarsItems.marsItemBasic, 1, 6), new Object[] { "MXM", "SWS", "MXM", 'S', "slimeball", 'X', GCItems.oxygenFan, 'M', meteoricIronIngot, 'W', new ItemStack(GCItems.basicItem, 1, 14) });
>>>>>>>
RecipeUtil.addRecipeUpdatable(new ItemStack(MarsItems.marsItemBasic, 1, 6), new Object[] { "MXM", "SWS", "MXM", 'S', "slimeball", 'X', GCItems.oxygenFan, 'M', meteoricIronIngot, 'W', new ItemStack(GCItems.basicItem, 1, 14) });
<<<<<<<
RecipeUtil.addRecipe(new ItemStack(MarsItems.marsItemBasic, 1, 4), new Object[] { "XWX", "XYX", " Z ", 'W', Items.DIAMOND, 'X', Items.LEATHER, 'Y', Items.SLIME_BALL, 'Z', Blocks.CHEST });
=======
RecipeUtil.addRecipe(new ItemStack(MarsItems.marsItemBasic, 1, 4), new Object[] { "XWX", "XYX", " Z ", 'W', Items.diamond, 'X', Items.leather, 'Y', "slimeball", 'Z', Blocks.chest });
>>>>>>>
RecipeUtil.addRecipe(new ItemStack(MarsItems.marsItemBasic, 1, 4), new Object[] { "XWX", "XYX", " Z ", 'W', Items.DIAMOND, 'X', Items.LEATHER, 'Y', "slimeball", 'Z', Blocks.CHEST }); |
<<<<<<<
if (minecraft.currentScreen == null && player != null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
=======
if (minecraft.currentScreen == null && player.ridingEntity != null && player.ridingEntity instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
>>>>>>>
if (minecraft.currentScreen == null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
<<<<<<<
if (minecraft.currentScreen == null && player != null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntityLander && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
=======
if (minecraft.currentScreen == null && player.ridingEntity != null && player.ridingEntity instanceof EntityLander && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
>>>>>>>
if (minecraft.currentScreen == null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntityLander && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
<<<<<<<
if (minecraft.currentScreen == null && player != null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntityAutoRocket && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
=======
if (minecraft.currentScreen == null && player.ridingEntity != null && player.ridingEntity instanceof EntityAutoRocket && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
>>>>>>>
if (minecraft.currentScreen == null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntityAutoRocket && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI)
<<<<<<<
if (minecraft.currentScreen == null && player != null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI && ((EntitySpaceshipBase) minecraft.thePlayer.getRidingEntity()).launchPhase != EnumLaunchPhase.LAUNCHED.ordinal())
=======
if (minecraft.currentScreen == null && player.ridingEntity != null && player.ridingEntity instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI && ((EntitySpaceshipBase) minecraft.thePlayer.ridingEntity).launchPhase != EnumLaunchPhase.LAUNCHED.ordinal())
>>>>>>>
if (minecraft.currentScreen == null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySpaceshipBase && minecraft.gameSettings.thirdPersonView != 0 && !minecraft.gameSettings.hideGUI && ((EntitySpaceshipBase) minecraft.thePlayer.getRidingEntity()).launchPhase != EnumLaunchPhase.LAUNCHED.ordinal())
<<<<<<<
if (world.provider.getSkyRenderer() == null &&
player.getRidingEntity() instanceof EntitySpaceshipBase &&
player.getRidingEntity().posY > Constants.OVERWORLD_SKYPROVIDER_STARTHEIGHT)
=======
if (world.provider.getSkyRenderer() == null && inSpaceShip &&
player.ridingEntity.posY > Constants.OVERWORLD_SKYPROVIDER_STARTHEIGHT)
>>>>>>>
if (world.provider.getSkyRenderer() == null && inSpaceShip &&
player.getRidingEntity().posY > Constants.OVERWORLD_SKYPROVIDER_STARTHEIGHT)
<<<<<<<
if (player != null && player.getRidingEntity() != null && player.getRidingEntity() instanceof EntitySpaceshipBase)
=======
if (inSpaceShip)
>>>>>>>
if (inSpaceShip)
<<<<<<<
if (player != null && player.getRidingEntity() != null && isPressed && !ClientProxyCore.lastSpacebarDown)
=======
if (player.ridingEntity != null && isPressed && !ClientProxyCore.lastSpacebarDown)
>>>>>>>
if (player.getRidingEntity() != null && isPressed && !ClientProxyCore.lastSpacebarDown) |
<<<<<<<
=======
import static net.minecraftforge.oredict.RecipeSorter.Category.SHAPED;
import buildcraft.api.recipes.BuildcraftRecipeRegistry;
>>>>>>> |
<<<<<<<
import micdoodle8.mods.galacticraft.core.tile.TileEntityTelemetry;
=======
import micdoodle8.mods.galacticraft.core.util.WorldUtil;
>>>>>>>
<<<<<<<
private boolean noClipOverride;
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, PlayerInteractionManager interactionManager)
=======
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, ItemInWorldManager itemInWorldManager)
>>>>>>>
public GCEntityPlayerMP(MinecraftServer server, WorldServer world, GameProfile profile, PlayerInteractionManager interactionManager) |
<<<<<<<
World worldOld = player.world;
if (ConfigManagerCore.enableDebug)
{
try
{
GCLog.info("DEBUG: Attempting to remove player from old dimension " + oldDimID);
((WorldServer) worldOld).getPlayerChunkMap().removePlayer(player);
GCLog.info("DEBUG: Successfully removed player from old dimension " + oldDimID);
}
catch (Exception e)
{
e.printStackTrace();
}
}
else
{
try
{
((WorldServer) worldOld).getPlayerChunkMap().removePlayer(player);
}
catch (Exception e)
{
}
}
=======
World worldOld = player.worldObj;
>>>>>>>
World worldOld = player.world; |
<<<<<<<
if (String.valueOf(this.data.get(2)).equals(String.valueOf(FMLClientHandler.instance().getClient().player.getGameProfile().getName())))
=======
if (String.valueOf(this.data.get(2)).equals(String.valueOf(PlayerUtil.getName(player))))
>>>>>>>
if (String.valueOf(this.data.get(2)).equals(String.valueOf(PlayerUtil.getName(player))))
<<<<<<<
if (String.valueOf(this.data.get(0)).equals(FMLClientHandler.instance().getClient().player.getGameProfile().getName()))
=======
if (String.valueOf(this.data.get(0)).equals(PlayerUtil.getName(player)))
>>>>>>>
if (String.valueOf(this.data.get(0)).equals(PlayerUtil.getName(player)))
<<<<<<<
playerInvited.sendMessage(new TextComponentString(dA + GCCoreUtil.translateWithFormat("gui.space_race.chat.invite_received", bG + player.getGameProfile().getName() + dA) + " " + GCCoreUtil.translateWithFormat("gui.space_race.chat.to_join", teamNameTotal, EnumColor.AQUA + "/joinrace" + dA)).setStyle(new Style().setColor(TextFormatting.DARK_AQUA)));
=======
playerInvited.addChatMessage(new TextComponentString(dA + GCCoreUtil.translateWithFormat("gui.space_race.chat.invite_received", bG + PlayerUtil.getName(player) + dA) + " " + GCCoreUtil.translateWithFormat("gui.space_race.chat.to_join", teamNameTotal, EnumColor.AQUA + "/joinrace" + dA)).setStyle(new Style().setColor(TextFormatting.DARK_AQUA)));
>>>>>>>
playerInvited.sendMessage(new TextComponentString(dA + GCCoreUtil.translateWithFormat("gui.space_race.chat.invite_received", bG + PlayerUtil.getName(player) + dA) + " " + GCCoreUtil.translateWithFormat("gui.space_race.chat.to_join", teamNameTotal, EnumColor.AQUA + "/joinrace" + dA)).setStyle(new Style().setColor(TextFormatting.DARK_AQUA))); |
<<<<<<<
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.capability.ItemFluidContainer;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
import net.minecraftforge.fml.common.Loader;
=======
import net.minecraftforge.fluids.*;
>>>>>>>
import net.minecraftforge.common.capabilities.ICapabilityProvider;
import net.minecraftforge.fluids.Fluid;
import net.minecraftforge.fluids.capability.ItemFluidContainer;
import net.minecraftforge.fluids.capability.templates.FluidHandlerItemStack;
<<<<<<<
public final static int EMPTY = Fluid.BUCKET_VOLUME + 1;
private static boolean isTELoaded = Loader.isModLoaded("ThermalExpansion");
private final ItemStack containerStack = new ItemStack(this, 1, 1);
private final ItemStack emptyContainerStack = this.getContainerItem(this.containerStack);
=======
public final static int EMPTY = FluidContainerRegistry.BUCKET_VOLUME + 1;
private static boolean isTELoaded = CompatibilityManager.isTELoaded();
>>>>>>>
public final static int EMPTY = Fluid.BUCKET_VOLUME + 1;
private static boolean isTELoaded = CompatibilityManager.isTELoaded();
private final ItemStack containerStack = new ItemStack(this, 1, 1);
private final ItemStack emptyContainerStack = this.getContainerItem(this.containerStack); |
<<<<<<<
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos)
{
return new AxisAlignedBB((double) pos.getX() + -0.0F, (double) pos.getY() + 0.0F, (double) pos.getZ() + -0.0F, (double) pos.getX() + 1.0F, (double) pos.getY() + 1.4F, (double) pos.getZ() + 1.0F);
}
// @SideOnly(Side.CLIENT)
// @Override
// public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos)
// {
// return this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
// }
//
// @Override
// public RayTraceResult collisionRayTrace(World worldIn, BlockPos pos, Vec3d start, Vec3d end)
// {
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
//
// final RayTraceResult r = super.collisionRayTrace(worldIn, pos, start, end);
//
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
//
// return r;
// }
//
// @SuppressWarnings("rawtypes")
// @Override
// public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
// {
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
// super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
// }
=======
public AxisAlignedBB getCollisionBoundingBox(World worldIn, BlockPos pos, IBlockState state)
{
return AxisAlignedBB.fromBounds((double) pos.getX() + -0.0F, (double) pos.getY() + 0.0F, (double) pos.getZ() + -0.0F, (double) pos.getX() + 1.0F, (double) pos.getY() + 1.4F, (double) pos.getZ() + 1.0F);
}
@SideOnly(Side.CLIENT)
@Override
public AxisAlignedBB getSelectedBoundingBox(World worldIn, BlockPos pos)
{
return this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
}
@Override
public MovingObjectPosition collisionRayTrace(World worldIn, BlockPos pos, Vec3 start, Vec3 end)
{
this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
final MovingObjectPosition r = super.collisionRayTrace(worldIn, pos, start, end);
this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
return r;
}
@Override
public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
{
this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
}
>>>>>>>
public AxisAlignedBB getCollisionBoundingBox(IBlockState blockState, World worldIn, BlockPos pos)
{
return new AxisAlignedBB((double) pos.getX() + -0.0F, (double) pos.getY() + 0.0F, (double) pos.getZ() + -0.0F, (double) pos.getX() + 1.0F, (double) pos.getY() + 1.4F, (double) pos.getZ() + 1.0F);
}
// @SideOnly(Side.CLIENT)
// @Override
// public AxisAlignedBB getSelectedBoundingBox(IBlockState state, World worldIn, BlockPos pos)
// {
// return this.getCollisionBoundingBox(worldIn, pos, worldIn.getBlockState(pos));
// }
//
// @Override
// public RayTraceResult collisionRayTrace(World worldIn, BlockPos pos, Vec3d start, Vec3d end)
// {
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
//
// final RayTraceResult r = super.collisionRayTrace(worldIn, pos, start, end);
//
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
//
// return r;
// }
//
// @Override
// public void addCollisionBoxesToList(World worldIn, BlockPos pos, IBlockState state, AxisAlignedBB mask, List list, Entity collidingEntity)
// {
// this.setBlockBounds(-0.0F, 0.0F, -0.0F, 1.0F, 1.4F, 1.0F);
// super.addCollisionBoxesToList(worldIn, pos, state, mask, list, collidingEntity);
// } |
<<<<<<<
import org.python.pydev.core.IInterpreterInfo;
import org.python.pydev.core.Tuple4;
=======
import org.python.pydev.core.IPythonNature;
import org.python.pydev.core.Tuple3;
>>>>>>>
import org.python.pydev.core.IInterpreterInfo;
import org.python.pydev.core.IPythonNature;
import org.python.pydev.core.Tuple4;
<<<<<<<
consoleInterpreter.setConsoleCommunication(new PydevConsoleCommunication(port, launchAndProcess.o2, launchAndProcess.o3));
consoleInterpreter.setNaturesUsed(iprocessFactory.getNaturesUsed());
consoleInterpreter.setInterpreterInfo(launchAndProcess.o4);
=======
consoleInterpreter.setConsoleCommunication(
new PydevConsoleCommunication(port, process, clientPort));
consoleInterpreter.setNaturesUsed(natures);
>>>>>>>
consoleInterpreter.setConsoleCommunication(
new PydevConsoleCommunication(port, process, clientPort));
consoleInterpreter.setNaturesUsed(natures);
consoleInterpreter.setInterpreterInfo(interpreterInfo); |
<<<<<<<
=======
import com.google.common.collect.Lists;
import micdoodle8.mods.galacticraft.core.GCItems;
>>>>>>>
<<<<<<<
=======
import micdoodle8.mods.galacticraft.planets.asteroids.items.AsteroidsItems;
import micdoodle8.mods.galacticraft.planets.mars.items.MarsItems;
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
>>>>>>>
import micdoodle8.mods.galacticraft.planets.venus.VenusItems;
<<<<<<<
import net.minecraft.item.ItemStack;
=======
import net.minecraft.init.Items;
import net.minecraft.item.ItemStack;
>>>>>>>
import net.minecraft.item.ItemStack; |
<<<<<<<
final float var2 = this.world.getCelestialAngle(par1);
float var3 = 1.0F - (MathHelper.cos(var2 * (float) Math.PI * 2.0F) * 2.0F + 0.25F);
=======
final float var2 = this.worldObj.getCelestialAngle(par1);
float var3 = 1.0F - (MathHelper.cos(var2 * Constants.twoPI) * 2.0F + 0.25F);
>>>>>>>
final float var2 = this.world.getCelestialAngle(par1);
float var3 = 1.0F - (MathHelper.cos(var2 * Constants.twoPI) * 2.0F + 0.25F);
<<<<<<<
// @Override
// public IChunkProvider createChunkGenerator()
// {
// return new ChunkProviderMoon(this.world, this.world.getSeed(), this.world.getWorldInfo().isMapFeaturesEnabled());
// }
// @Override
// public void updateWeather()
// {
// this.world.getWorldInfo().setRainTime(0);
// this.world.getWorldInfo().setRaining(false);
// this.world.getWorldInfo().setThunderTime(0);
// this.world.getWorldInfo().setThundering(false);
// this.world.rainingStrength = 0.0F;
// this.world.thunderingStrength = 0.0F;
// }
=======
>>>>>>>
<<<<<<<
//Overriding only in case the Galacticraft API is not up-to-date
//(with up-to-date API this makes zero difference)
@Override
public boolean isSurfaceWorld()
{
return (this.world == null) ? false : this.world.isRemote;
}
=======
>>>>>>> |
<<<<<<<
this.spawnableCaveCreatureList.clear();
this.resetMonsterListByMode(ConfigManagerCore.challengeMode || ConfigManagerCore.challengeMobDropsAndSpawning);
=======
this.resetMonsterListByMode(ConfigManagerCore.challengeMobDropsAndSpawning);
>>>>>>>
this.spawnableCaveCreatureList.clear();
this.resetMonsterListByMode(ConfigManagerCore.challengeMobDropsAndSpawning); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.jei.GalacticraftJEI;
=======
import micdoodle8.mods.galacticraft.core.blocks.BlockMachine3;
>>>>>>>
<<<<<<<
=======
import micdoodle8.mods.galacticraft.core.items.ItemParaChute;
import micdoodle8.mods.galacticraft.core.tick.TickHandlerClient;
>>>>>>>
import micdoodle8.mods.galacticraft.core.tick.TickHandlerClient;
<<<<<<<
=======
ItemStack solarPanels = new ItemStack(GCItems.basicItem, 9, 12);
ItemStack basicWafers = new ItemStack(GCItems.basicItem, 3, 13);
ItemStack advancedWafers = new ItemStack(GCItems.basicItem, 1, 14);
ItemStack silicon = new ItemStack(GCItems.basicItem, 1, 2);
CircuitFabricatorRecipes.addRecipe(solarPanels, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Items.DYE, 1, 4) ));
CircuitFabricatorRecipes.addRecipe(basicWafers, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Blocks.REDSTONE_TORCH) ));
CircuitFabricatorRecipes.addRecipe(advancedWafers, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Items.REPEATER) ));
RecipeUtil.addShapelessOreRecipe(new ItemStack(GCItems.prelaunchChecklist), new Object[] { new ItemStack(Items.DYE, 1, 1), GCItems.canvas });
>>>>>>>
ItemStack solarPanels = new ItemStack(GCItems.basicItem, 9, 12);
ItemStack basicWafers = new ItemStack(GCItems.basicItem, 3, 13);
ItemStack advancedWafers = new ItemStack(GCItems.basicItem, 1, 14);
ItemStack silicon = new ItemStack(GCItems.basicItem, 1, 2);
CircuitFabricatorRecipes.addRecipe(solarPanels, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Items.DYE, 1, 4) ));
CircuitFabricatorRecipes.addRecipe(basicWafers, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Blocks.REDSTONE_TORCH) ));
CircuitFabricatorRecipes.addRecipe(advancedWafers, Arrays.asList( new ItemStack(Items.DIAMOND), silicon, silicon, new ItemStack(Items.REDSTONE), new ItemStack(Items.REPEATER) )); |
<<<<<<<
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.FLOWING_LAVA.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.flowing_lava.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.FLOWING_LAVA.getDefaultState(), i, j, k, chunkBox);
<<<<<<<
this.setBlockState(worldIn, Blocks.IRON_BARS.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.iron_bars.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.IRON_BARS.getDefaultState(), i, j, k, chunkBox);
<<<<<<<
this.setBlockState(worldIn, Blocks.IRON_BARS.getDefaultState(), i, j, k, boundingBox);
=======
this.setBlockState(worldIn, Blocks.iron_bars.getDefaultState(), i, j, k, chunkBox);
>>>>>>>
this.setBlockState(worldIn, Blocks.IRON_BARS.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); |
<<<<<<<
return new BlockStateContainer(this, FACING, TYPE, FILL_VALUE);
=======
return new BlockState(this, FACING, TYPE, FILL_VALUE, SIDES);
>>>>>>>
return new BlockStateContainer(this, FACING, TYPE, FILL_VALUE, SIDES); |
<<<<<<<
=======
protected boolean isResizable() {
return true;
}
>>>>>>>
protected boolean isResizable() {
return true;
}
<<<<<<<
=======
>>>>>>> |
<<<<<<<
=======
RecipeUtil.addRecipe(new ItemStack(GCBlocks.cheeseBlock, 1), new Object[] { "YYY", "YXY", "YYY", 'X', Items.milk_bucket, 'Y', "foodCheese" });
>>>>>>> |
<<<<<<<
import net.minecraft.inventory.IInventory;
import net.minecraft.inventory.ItemStackHelper;
=======
>>>>>>>
import net.minecraft.inventory.ItemStackHelper;
<<<<<<<
abstract protected NonNullList<ItemStack> getContainingItems();
@Override
public void openInventory(EntityPlayer player)
{
}
@Override
public void closeInventory(EntityPlayer player)
{
}
@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()
{
}
=======
abstract protected ItemStack[] getContainingItems();
>>>>>>>
abstract protected NonNullList<ItemStack> getContainingItems(); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.client.jei.ingotcompressor.IngotCompressorShapelessRecipeWrapper;
=======
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeCategory;
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeHandler;
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeMaker;
>>>>>>>
import micdoodle8.mods.galacticraft.core.client.jei.ingotcompressor.IngotCompressorShapelessRecipeWrapper;
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeCategory;
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeHandler;
import micdoodle8.mods.galacticraft.core.client.jei.oxygencompressor.OxygenCompressorRecipeMaker;
<<<<<<<
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
=======
>>>>>>>
import net.minecraft.item.ItemStack;
import net.minecraft.item.crafting.IRecipe;
<<<<<<<
ingotCompressorCategory,
=======
new IngotCompressorRecipeCategory(guiHelper),
new OxygenCompressorRecipeCategory(guiHelper),
>>>>>>>
ingotCompressorCategory,
new OxygenCompressorRecipeCategory(guiHelper),
<<<<<<<
new RefineryRecipeHandler(),
new NBTSensitiveShapedRecipeHandler());
=======
new OxygenCompressorRecipeHandler(),
new RefineryRecipeHandler());
>>>>>>>
new OxygenCompressorRecipeHandler(),
new RefineryRecipeHandler(),
new NBTSensitiveShapedRecipeHandler()); |
<<<<<<<
=======
import micdoodle8.mods.galacticraft.core.blocks.BlockMachineTiered;
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
>>>>>>>
import micdoodle8.mods.galacticraft.core.util.CompatibilityManager;
<<<<<<<
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.NonNullList;
=======
import net.minecraftforge.oredict.OreDictionary;
import ic2.api.recipe.Recipes;
import java.util.ArrayList;
import java.util.List;
>>>>>>>
import net.minecraft.item.crafting.Ingredient;
import net.minecraft.util.NonNullList;
import ic2.api.recipe.Recipes;
<<<<<<<
NonNullList<Ingredient> list1 = NonNullList.create();
NonNullList<Ingredient> list2 = NonNullList.create();
NonNullList<Ingredient> list3 = NonNullList.create();
list1.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 751)));
list2.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 834)));
list3.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 918)));
list1.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankHeavy, 1, 2700)));
list2.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankMedium, 1, 1800)));
list3.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankLight, 1, 900)));
=======
List<ItemStack> list1 = new ArrayList<>();
List<ItemStack> list2 = new ArrayList<>();
List<ItemStack> list3 = new ArrayList<>();
list1.add(new ItemStack(AsteroidsItems.canisterLOX, 1, 751));
list2.add(new ItemStack(AsteroidsItems.canisterLOX, 1, 834));
list3.add(new ItemStack(AsteroidsItems.canisterLOX, 1, 918));
list1.add(new ItemStack(GCItems.oxTankHeavy, 1, 2700));
list2.add(new ItemStack(GCItems.oxTankMedium, 1, 1800));
list3.add(new ItemStack(GCItems.oxTankLight, 1, 900));
>>>>>>>
NonNullList<Ingredient> list1 = NonNullList.create();
NonNullList<Ingredient> list2 = NonNullList.create();
NonNullList<Ingredient> list3 = NonNullList.create();
list1.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 751)));
list2.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 834)));
list3.add(Ingredient.fromStacks(new ItemStack(AsteroidsItems.canisterLOX, 1, 918)));
list1.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankHeavy, 1, 2700)));
list2.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankMedium, 1, 1800)));
list3.add(Ingredient.fromStacks(new ItemStack(GCItems.oxTankLight, 1, 900))); |
<<<<<<<
import org.python.pydev.shared_core.string.StringUtils;
import org.python.pydev.shared_ui.EditorUtils;
=======
>>>>>>>
import org.python.pydev.shared_core.string.StringUtils; |
<<<<<<<
public static final PropertyEnum BASIC_TYPE = PropertyEnum.create("basictypemars", EnumBlockBasic.class);
=======
public static final PropertyEnum<EnumBlockBasic> BASIC_TYPE = PropertyEnum.create("basicTypeMars", EnumBlockBasic.class);
>>>>>>>
public static final PropertyEnum<EnumBlockBasic> BASIC_TYPE = PropertyEnum.create("basictypemars", EnumBlockBasic.class); |
<<<<<<<
for (int y = MathHelper.floor_double(this.posY) - 3; y <= MathHelper.floor_double(this.posY) + 1; y++)
{
for (int z = MathHelper.floor_double(this.posZ) - 1; z <= MathHelper.floor_double(this.posZ) + 1; z++)
{
BlockPos pos = new BlockPos(x, y, z);
TileEntity tile = this.worldObj.getTileEntity(pos);
=======
for (int z = MathHelper.floor_double(this.posZ) - 1; z <= MathHelper.floor_double(this.posZ) + 1; z++)
{
for (int y = yMin; y <= yMax; y++)
{
TileEntity tile = this.worldObj.getTileEntity(x, y, z);
>>>>>>>
for (int z = MathHelper.floor_double(this.posZ) - 1; z <= MathHelper.floor_double(this.posZ) + 1; z++)
{
for (int y = yMin; y <= yMax; y++)
{
BlockPos pos = new BlockPos(x, y, z);
TileEntity tile = this.worldObj.getTileEntity(pos);
<<<<<<<
if (launchController != null)
{
TileEntity tile2 = launchController.getWorld().getTileEntity(launchController.getPos());
try
{
controllerClass.cast(tile2);
}
catch (ClassCastException e)
{
launchController = null;
continue;
}
launchController = tile2;
}
if (launchController != null)
{
break;
}
=======
break;
>>>>>>>
break;
<<<<<<<
Boolean b = (Boolean) controllerClass.getMethod("validFrequency").invoke(launchController);
=======
//This includes a check whether the Launch Controller has energy
Boolean b = (Boolean) controllerClass.getMethod("validFrequency").invoke(launchController);
>>>>>>>
//This includes a check whether the Launch Controller has energy
Boolean b = (Boolean) controllerClass.getMethod("validFrequency").invoke(launchController);
<<<<<<<
if (tile != null)
{
tile = world.getTileEntity(tile.getPos());
if (tile == null) continue;
=======
if (!controllerClass.isInstance(tile))
continue;
>>>>>>>
if (!controllerClass.isInstance(tile))
continue;
<<<<<<<
if (this.landing && this.targetVec != null && this.worldObj.getTileEntity(this.targetVec) instanceof IFuelDock)
=======
if (this.targetVec != null && this.worldObj.getTileEntity(this.targetVec.x, this.targetVec.y, this.targetVec.z) instanceof IFuelDock)
>>>>>>>
if (this.targetVec != null && this.worldObj.getTileEntity(this.targetVec) instanceof IFuelDock)
<<<<<<<
if (this.getEntityBoundingBox().minY - this.targetVec.getY() < 0.5F)
=======
if (this.boundingBox.minY - this.targetVec.y < 0.2F)
>>>>>>>
if (this.getEntityBoundingBox().minY - this.targetVec.getY() < 0.2F)
<<<<<<<
for (int y = MathHelper.floor_double(this.getEntityBoundingBox().minY - this.getOnPadYOffset() - 0.45D) - 1; y <= MathHelper.floor_double(this.getEntityBoundingBox().maxY) + 1; y++)
{
for (int z = MathHelper.floor_double(this.posZ) - 1; z <= MathHelper.floor_double(this.posZ) + 1; z++)
{
TileEntity tile = this.worldObj.getTileEntity(new BlockPos(x, y, z));
if (tile instanceof IFuelDock)
=======
for (int z = zMin; z <= zMax; z++)
{
//Doing y as the inner loop may help with cacheing of chunks
for (int y = yMin; y <= yMax; y++)
{
if (this.worldObj.getTileEntity(x, y, z) instanceof IFuelDock)
>>>>>>>
for (int z = zMin; z <= zMax; z++)
{
//Doing y as the inner loop may help with cacheing of chunks
for (int y = yMin; y <= yMax; y++)
{
if (this.worldObj.getTileEntity(new BlockPos(x, y, z)) instanceof IFuelDock)
<<<<<<<
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);
}
}
}
=======
this.updateControllerSettings(this.landingPad);
>>>>>>>
this.updateControllerSettings(this.landingPad);
<<<<<<<
TileEntity updatedTile = this.worldObj.getTileEntity(((TileEntity) connectedTile).getPos());
try
{
controllerClass.cast(updatedTile);
}
catch (ClassCastException e)
{
continue;
}
controllerClass.getField("attachedDock").set(updatedTile, dock);
=======
// TileEntity updatedTile = this.worldObj.getTileEntity(((TileEntity) connectedTile).xCoord, ((TileEntity) connectedTile).yCoord, ((TileEntity) connectedTile).zCoord);
//
// if (!controllerClass.isInstance(updatedTile))
// continue;
//
// controllerClass.getField("attachedDock").set(updatedTile, dock);
>>>>>>> |
<<<<<<<
super.validate();
if (this.world.isRemote)
=======
if (this.worldObj.isRemote)
>>>>>>>
if (this.world.isRemote) |
<<<<<<<
import micdoodle8.mods.galacticraft.planets.venus.world.gen.BiomeProviderVenus;
=======
import micdoodle8.mods.galacticraft.planets.venus.client.fx.EntityAcidVaporFX;
>>>>>>>
import micdoodle8.mods.galacticraft.planets.venus.client.fx.ParticleAcidVapor;
import micdoodle8.mods.galacticraft.planets.venus.world.gen.BiomeProviderVenus;
<<<<<<<
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
=======
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.particle.EntityFX;
import net.minecraft.util.BlockPos;
import net.minecraft.util.MathHelper;
import net.minecraft.world.World;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.IChunkProvider;
>>>>>>>
import net.minecraft.client.Minecraft;
import net.minecraft.client.multiplayer.WorldClient;
import net.minecraft.client.particle.Particle;
import net.minecraft.init.SoundEvents;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.SoundCategory;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.BlockPos;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator;
import net.minecraft.world.World;
<<<<<<<
private double solarMultiplier = -0.36D;
=======
private double solarMultiplier = 0.36D;
private float prevRainingStrength;
private float rainingStrength;
private boolean raining = false;
private int rainTime = 100;
private int rainChange = 100;
private float targetRain = 0.0F;
>>>>>>>
private double solarMultiplier = -0.36D;
private float prevRainingStrength;
private float rainingStrength;
private boolean raining = false;
private int rainTime = 100;
private int rainChange = 100;
private float targetRain = 0.0F; |
<<<<<<<
IBlockState state = this.world.getBlockState(pos);
Material material = state.getBlock().getMaterial(state);
=======
IBlockState state = this.worldObj.getBlockState(pos);
Material material = state.getMaterial();
>>>>>>>
IBlockState state = this.world.getBlockState(pos);
Material material = state.getMaterial(); |
<<<<<<<
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
=======
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
>>>>>>>
import micdoodle8.mods.galacticraft.core.energy.tile.TileBaseUniversalElectrical;
import micdoodle8.mods.galacticraft.core.items.ItemBlockDesc;
<<<<<<<
import micdoodle8.mods.galacticraft.core.tile.TileEntityUniversalElectrical;
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil;
=======
>>>>>>>
import micdoodle8.mods.galacticraft.core.util.GCCoreUtil; |
<<<<<<<
float f3 = MathHelper.sqrt(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, f3) * 180.0D / Math.PI);
=======
float f3 = MathHelper.sqrt_double(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(par1, par5) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(par3, f3) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f3 = MathHelper.sqrt(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(par1, par5) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(par3, f3) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
float f = MathHelper.sqrt(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(par3, f) * 180.0D / Math.PI);
=======
float f = MathHelper.sqrt_double(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(par1, par5) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(par3, f) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f = MathHelper.sqrt(par1 * par1 + par5 * par5);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(par1, par5) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(par3, f) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
this.prevRotationPitch = this.rotationPitch = (float) (Math.atan2(this.motionY, f) * 180.0D / Math.PI);
=======
float f = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(this.motionY, f) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
float f = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.prevRotationYaw = this.rotationYaw = (float) Math.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.prevRotationPitch = this.rotationPitch = (float) Math.atan2(this.motionY, f) * Constants.RADIANS_TO_DEGREES;
<<<<<<<
motion = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) (Math.atan2(this.motionX, this.motionZ) * 180.0D / Math.PI);
this.rotationPitch = (float) (Math.atan2(this.motionY, motion) * 180.0D / Math.PI);
=======
motion = MathHelper.sqrt_double(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) Math.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.rotationPitch = (float) Math.atan2(this.motionY, motion) * Constants.RADIANS_TO_DEGREES;
>>>>>>>
motion = MathHelper.sqrt(this.motionX * this.motionX + this.motionZ * this.motionZ);
this.rotationYaw = (float) Math.atan2(this.motionX, this.motionZ) * Constants.RADIANS_TO_DEGREES;
this.rotationPitch = (float) Math.atan2(this.motionY, motion) * Constants.RADIANS_TO_DEGREES; |
<<<<<<<
prop.setComment("Dimension ID for Mars");
prop.setLanguageKey("gc.configgui.dimensionIDMars").setRequiresMcRestart(true);
=======
prop.comment = "Dimension ID for Mars";
prop.setLanguageKey("gc.configgui.dimension_i_d_mars").setRequiresMcRestart(true);
>>>>>>>
prop.setComment("Dimension ID for Mars");
prop.setLanguageKey("gc.configgui.dimension_i_d_mars").setRequiresMcRestart(true);
<<<<<<<
prop.setComment("Schematic ID for Tier 2 Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.idSchematicRocketT2");
=======
prop.comment = "Schematic ID for Tier 2 Rocket, must be unique.";
prop.setLanguageKey("gc.configgui.id_schematic_rocket_t2");
>>>>>>>
prop.setComment("Schematic ID for Tier 2 Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.id_schematic_rocket_t2");
<<<<<<<
prop.setComment("Schematic ID for Cargo Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.idSchematicCargoRocket");
=======
prop.comment = "Schematic ID for Cargo Rocket, must be unique.";
prop.setLanguageKey("gc.configgui.id_schematic_cargo_rocket");
>>>>>>>
prop.setComment("Schematic ID for Cargo Rocket, must be unique.");
prop.setLanguageKey("gc.configgui.id_schematic_cargo_rocket");
<<<<<<<
prop.setComment("Whether or not the launch controller acts as a chunk loader. Will cause issues if disabled!");
prop.setLanguageKey("gc.configgui.launchControllerChunkLoad");
=======
prop.comment = "Whether or not the launch controller acts as a chunk loader. Will cause issues if disabled!";
prop.setLanguageKey("gc.configgui.launch_controller_chunk_load");
>>>>>>>
prop.setComment("Whether or not the launch controller acts as a chunk loader. Will cause issues if disabled!");
prop.setLanguageKey("gc.configgui.launch_controller_chunk_load");
<<<<<<<
prop.setComment("May rarely cause issues if enabled, depends on how the other mod's dimensions are.");
prop.setLanguageKey("gc.configgui.launchControllerAllDims");
=======
prop.comment = "May rarely cause issues if enabled, depends on how the other mod's dimensions are.";
prop.setLanguageKey("gc.configgui.launch_controller_all_dims");
>>>>>>>
prop.setComment("May rarely cause issues if enabled, depends on how the other mod's dimensions are.");
prop.setLanguageKey("gc.configgui.launch_controller_all_dims");
<<<<<<<
prop.setComment("Disable Iron Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disableIronGenMars");
=======
prop.comment = "Disable Iron Ore Gen on Mars.";
prop.setLanguageKey("gc.configgui.disable_iron_gen_mars");
>>>>>>>
prop.setComment("Disable Iron Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disable_iron_gen_mars");
<<<<<<<
prop.setComment("Disable Copper Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disableCopperGenMars");
=======
prop.comment = "Disable Copper Ore Gen on Mars.";
prop.setLanguageKey("gc.configgui.disable_copper_gen_mars");
>>>>>>>
prop.setComment("Disable Copper Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disable_copper_gen_mars");
<<<<<<<
prop.setComment("Disable Tin Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disableTinGenMars");
=======
prop.comment = "Disable Tin Ore Gen on Mars.";
prop.setLanguageKey("gc.configgui.disable_tin_gen_mars");
>>>>>>>
prop.setComment("Disable Tin Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disable_tin_gen_mars");
<<<<<<<
prop.setComment("Disable Desh Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disableDeshGenMars");
=======
prop.comment = "Disable Desh Ore Gen on Mars.";
prop.setLanguageKey("gc.configgui.disable_desh_gen_mars");
>>>>>>>
prop.setComment("Disable Desh Ore Gen on Mars.");
prop.setLanguageKey("gc.configgui.disable_desh_gen_mars"); |
<<<<<<<
Block air = Blocks.AIR;
=======
// long time1 = System.nanoTime();
int index = 0;
Block air = Blocks.air;
>>>>>>>
// long time1 = System.nanoTime();
int index = 0;
Block air = Blocks.AIR;
<<<<<<<
//No block update on server - not necessary for changing air to air (also must not trigger a sealer edge check!)
Block b = vec.getBlockState(this.worldObj).getBlock();
BlockPos pos = vec.toBlockPos();
=======
BlockPos blockpos = vec.toBlockPos();
Block b = this.worldObj.getBlockState(blockpos).getBlock();
IBlockState newState;
>>>>>>>
BlockPos blockpos = vec.toBlockPos();
Block b = this.worldObj.getBlockState(blockpos).getBlock();
IBlockState newState;
<<<<<<<
this.worldObj.setBlockState(pos, Blocks.AIR.getDefaultState(), (this.worldObj.isRemote) ? 2 : 0);
this.checkLightFor(EnumSkyBlock.BLOCK, pos);
=======
newState = Blocks.air.getDefaultState();
>>>>>>>
newState = Blocks.AIR.getDefaultState();
<<<<<<<
savedLight = this.worldObj.getLightFor(lightType, vec);
if (savedLight == 0) continue; //eliminate backtracking
IBlockState bs = this.worldObj.getBlockState(vec);
opacity = bs.getBlock().getLightOpacity(bs, this.worldObj, vec);
if (opacity <= 0) opacity = 1;
//Tack positions onto the list as long as it looks like lit from here. i.e. saved light is adjacent light - opacity!
//There will be some errors due to coincidence / equality of light levels from 2 sources
if (savedLight == arraylight - opacity && index < lightUpdateBlockList.length)
{
lightUpdateBlockList[index++] = vec.getX() - x | vec.getY() - y << 6 | vec.getZ() - z << 12 | savedLight << 18;
}
=======
lightUpdateBlockList[index++] = vec.getX() - x + (((savedLight << 6) + vec.getZ() - z << 6) + vec.getY() - y << 6);
>>>>>>>
lightUpdateBlockList[index++] = vec.getX() - x + (((savedLight << 6) + vec.getZ() - z << 6) + vec.getY() - y << 6);
<<<<<<<
IBlockState bs = this.worldObj.getBlockState(pos);
Block block = bs.getBlock();
int blockLight = block.getLightValue(bs, this.worldObj, pos);
int light = lightType == EnumSkyBlock.SKY ? 0 : blockLight;
int opacity = block.getLightOpacity(bs, this.worldObj, pos);
if (opacity >= 15 && blockLight > 0)
{
opacity = 1;
}
=======
int opacity = block.getLightOpacity(this.worldObj, pos);
>>>>>>>
int opacity = block.getLightOpacity(bs, this.worldObj, pos); |
<<<<<<<
import com.google.common.collect.ImmutableMap;
=======
import com.google.common.collect.ImmutableList;
>>>>>>>
import com.google.common.collect.ImmutableList;
<<<<<<<
import net.minecraftforge.client.model.ModelLoaderRegistry;
=======
import net.minecraftforge.client.model.IFlexibleBakedModel;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.client.model.IModelState;
import net.minecraftforge.client.model.TRSRTransformation;
>>>>>>>
import net.minecraftforge.client.model.IModel;
<<<<<<<
model = (OBJModel) ModelLoaderRegistry.getModel(new ResourceLocation(modid, objLoc));
model = (OBJModel) model.process(ImmutableMap.of("flip-v", "true"));
=======
newModel = modelFromOBJ(new ResourceLocation(modid, objLoc), visibleGroups, parentState);
if (clazz != null)
{
newModel = clazz.getConstructor(IBakedModel.class).newInstance(newModel);
}
>>>>>>>
model = (OBJModel) OBJLoaderGC.instance.loadModel(new ResourceLocation(modid, objLoc));
<<<<<<<
if (!variant.equals("inventory"))
parentState = TRSRTransformation.identity();
IBakedModel newModel = model.bake(new OBJModel.OBJState(visibleGroups, false, parentState), DefaultVertexFormats.ITEM, spriteFunction);
if (clazz != null)
{
try
{
newModel = clazz.getConstructor(IBakedModel.class).newInstance(newModel);
} catch (Exception e)
{
GCLog.severe("ItemModel constructor problem for " + modelResourceLocation);
e.printStackTrace();
}
}
event.getModelRegistry().putObject(modelResourceLocation, newModel);
=======
event.modelRegistry.putObject(modelResourceLocation, newModel);
>>>>>>>
IBakedModel newModel = variant.equals("inventory") ? newModelBase : newModelAlt;
if (clazz != null)
{
try
{
newModel = clazz.getConstructor(IBakedModel.class).newInstance(newModel);
} catch (Exception e)
{
GCLog.severe("ItemModel constructor problem for " + modelResourceLocation);
e.printStackTrace();
}
}
event.getModelRegistry().putObject(modelResourceLocation, newModel);
<<<<<<<
public static void drawBakedModel(IBakedModel model)
=======
public static IFlexibleBakedModel modelFromOBJ(ResourceLocation loc) throws IOException
{
return (IFlexibleBakedModel) modelFromOBJ(loc, ImmutableList.of("main"));
}
public static IFlexibleBakedModel modelFromOBJ(ResourceLocation loc, List<String> visibleGroups) throws IOException
{
return (IFlexibleBakedModel) modelFromOBJ(loc, visibleGroups, TRSRTransformation.identity());
}
public static IBakedModel modelFromOBJ(ResourceLocation loc, List<String> visibleGroups, IModelState parentState) throws IOException
{
IModel model = OBJLoaderGC.instance.loadModel(loc);
Function<ResourceLocation, TextureAtlasSprite> spriteFunction = location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
return model.bake(new OBJModel.OBJState(visibleGroups, false, parentState), DefaultVertexFormats.ITEM, spriteFunction);
}
public static void drawBakedModel(IFlexibleBakedModel model)
>>>>>>>
public static IBakedModel modelFromOBJ(ResourceLocation loc) throws IOException
{
return modelFromOBJ(loc, ImmutableList.of("main"));
}
public static IBakedModel modelFromOBJ(ResourceLocation loc, List<String> visibleGroups) throws IOException
{
return modelFromOBJ(loc, visibleGroups, TRSRTransformation.identity());
}
public static IBakedModel modelFromOBJ(ResourceLocation loc, List<String> visibleGroups, IModelState parentState) throws IOException
{
IModel model = OBJLoaderGC.instance.loadModel(loc);
Function<ResourceLocation, TextureAtlasSprite> spriteFunction = location -> Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(location.toString());
return model.bake(new OBJModel.OBJState(visibleGroups, false, parentState), DefaultVertexFormats.ITEM, spriteFunction);
}
public static void drawBakedModel(IBakedModel model) |
<<<<<<<
=======
registry.addRecipeHandlers(new Tier1RocketRecipeHandler(),
new BuggyRecipeHandler(),
new CircuitFabricatorRecipeHandler(),
new IngotCompressorShapedRecipeHandler(),
new IngotCompressorShapelessRecipeHandler(),
new RefineryRecipeHandler(),
new NBTSensitiveShapedRecipeHandler());
registry.addRecipes(Tier1RocketRecipeMaker.getRecipesList());
registry.addRecipes(BuggyRecipeMaker.getRecipesList());
registry.addRecipes(CircuitFabricatorRecipeMaker.getRecipesList());
registry.addRecipes(CompressorRecipes.getRecipeListAll());
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.crafting), VanillaRecipeCategoryUid.CRAFTING);
registry.getRecipeTransferRegistry().addRecipeTransferHandler(new MagneticCraftingTransferInfo());
GCItems.hideItemsJEI(registry.getJeiHelpers().getItemBlacklist());
>>>>>>> |
<<<<<<<
@Nonnull
public ItemStack getRecipeOutput();
=======
ItemStack getRecipeOutput();
>>>>>>>
@Nonnull
ItemStack getRecipeOutput(); |
<<<<<<<
if (player.world.provider instanceof WorldProviderSpaceStation)
=======
if (player.worldObj.provider instanceof WorldProviderSpaceStation || player.worldObj.provider instanceof IZeroGDimension || GalacticraftCore.isPlanetsLoaded && player.worldObj.provider instanceof WorldProviderAsteroids)
>>>>>>>
if (player.world.provider instanceof WorldProviderSpaceStation || player.world.provider instanceof IZeroGDimension || GalacticraftCore.isPlanetsLoaded && player.world.provider instanceof WorldProviderAsteroids)
<<<<<<<
if (GalacticraftCore.isPlanetsLoaded && player.world.provider instanceof WorldProviderAsteroids)
{
this.preventFlyingKicks(player);
}
=======
>>>>>>> |
<<<<<<<
import net.minecraft.util.text.ITextComponent;
import net.minecraftforge.common.capabilities.Capability;
=======
>>>>>>>
import net.minecraftforge.common.capabilities.Capability;
<<<<<<<
public ITextComponent getDisplayName()
{
return null;
}
@Override
=======
>>>>>>> |
<<<<<<<
import micdoodle8.mods.galacticraft.core.world.gen.dungeon.RoomTreasure;
import net.minecraft.util.ResourceLocation;
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.core.world.gen.WorldChunkManagerMoon;
import micdoodle8.mods.galacticraft.core.world.gen.dungeon.RoomChest;
import net.minecraft.block.Block;
import net.minecraft.util.MathHelper;
import net.minecraft.world.biome.WorldChunkManager;
import net.minecraft.world.chunk.IChunkProvider;
>>>>>>>
import micdoodle8.mods.galacticraft.core.world.gen.dungeon.RoomTreasure;
import net.minecraft.block.Block;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.MathHelper;
import net.minecraft.world.DimensionType;
import net.minecraft.world.biome.BiomeProvider;
import net.minecraft.world.chunk.IChunkGenerator; |
<<<<<<<
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(PacketSimple.EnumSimplePacket.C_PLAY_SOUND_BOSS_DEATH, this.worldObj.provider.getDimension(), new Object[] { 1.5F }), new NetworkRegistry.TargetPoint(this.worldObj.provider.getDimension(), this.posX, this.posY, this.posZ, 40.0D));
=======
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(PacketSimple.EnumSimplePacket.C_PLAY_SOUND_BOSS_DEATH, GCCoreUtil.getDimensionID(this.worldObj), new Object[] { 1.5F }), new NetworkRegistry.TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D));
>>>>>>>
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(PacketSimple.EnumSimplePacket.C_PLAY_SOUND_BOSS_DEATH, GCCoreUtil.getDimensionID(this.worldObj), new Object[] { 1.5F }), new NetworkRegistry.TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D));
<<<<<<<
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOSS_LAUGH, this.worldObj.provider.getDimension(), new Object[] {}), new TargetPoint(this.worldObj.provider.getDimension(), this.posX, this.posY, this.posZ, 40.0D));
par1EntityPlayer.startRiding(this);
=======
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOSS_LAUGH, GCCoreUtil.getDimensionID(this.worldObj), new Object[] {}), new TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D));
par1EntityPlayer.mountEntity(this);
>>>>>>>
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOSS_LAUGH, GCCoreUtil.getDimensionID(this.worldObj), new Object[] {}), new TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D));
par1EntityPlayer.startRiding(this);
<<<<<<<
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOW, this.worldObj.provider.getDimension(), new Object[] {}), new TargetPoint(this.worldObj.provider.getDimension(), this.posX, this.posY, this.posZ, 40.0D));
=======
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOW, GCCoreUtil.getDimensionID(this.worldObj), new Object[] {}), new TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D));
>>>>>>>
GalacticraftCore.packetPipeline.sendToAllAround(new PacketSimple(EnumSimplePacket.C_PLAY_SOUND_BOW, GCCoreUtil.getDimensionID(this.worldObj), new Object[] {}), new TargetPoint(GCCoreUtil.getDimensionID(this.worldObj), this.posX, this.posY, this.posZ, 40.0D)); |
<<<<<<<
=======
import net.minecraft.world.storage.WorldInfo;
>>>>>>>
import net.minecraft.world.storage.WorldInfo;
<<<<<<<
private ChunkProviderSettings settings = null;
=======
private WorldType worldType;
private WorldInfo worldInfo;
private ChunkProviderSettings settings = null;
>>>>>>>
private WorldType worldType;
private WorldInfo worldInfo;
private ChunkProviderSettings settings = null;
<<<<<<<
this.worldType = worldIn.getWorldInfo().getTerrainType();
if (this.worldType == WorldType.CUSTOMIZED && !worldIn.getWorldInfo().getGeneratorOptions().isEmpty())
{
this.settings = ChunkProviderSettings.Factory.jsonToFactory(worldIn.getWorldInfo().getGeneratorOptions()).build();
}
=======
this.worldInfo = worldIn.getWorldInfo();
>>>>>>>
this.worldInfo = worldIn.getWorldInfo();
this.worldType = worldInfo.getTerrainType();
<<<<<<<
long seed = world.getSeed();
this.biomeCache = new BiomeCache(this);
GenLayer[] agenlayerOrig = GenLayer.initializeAllBiomeGenerators(seed, worldType, this.settings);
GenLayer[] agenlayer;
try {
agenlayer = getModdedBiomeGenerators(worldType, seed, agenlayerOrig);
}
catch (Exception e)
{
GCLog.severe("Galacticraft background map image generator not able to run (probably a mod conflict?)");
GCLog.severe("Please report this at https://github.com/micdoodle8/Galacticraft/issues/2481");
e.printStackTrace();
this.mapNeedsCalculating = false;
MapGen.disabled = true;
return;
}
this.genBiomes = agenlayer[0];
this.biomeIndexLayer = agenlayer[1];
=======
long seed = worldInfo.getSeed();
>>>>>>>
long seed = worldInfo.getSeed();
<<<<<<<
double d7 = noiseField1[l] / 512.0D;
double d8 = noiseField2[l] / 512.0D;
double d9 = (noiseField3[l] / 10.0D + 1.0D) / 2.0D;
heighttemp[l] = MathHelper.clampedLerp(d7, d8, d9) - d6;
++l;
=======
double d2 = this.minLimitRegion[i] / minLimitScale;
double d3 = this.maxLimitRegion[i] / maxLimitScale;
double d4 = (this.mainNoiseRegion[i] / 10.0D + 1.0D) / 2.0D;
double d5 = MathHelper.denormalizeClamp(d2, d3, d4) - d1;
heighttemp[i] = d5;
++i;
>>>>>>>
double d2 = this.minLimitRegion[i] / minLimitScale;
double d3 = this.maxLimitRegion[i] / maxLimitScale;
double d4 = (this.mainNoiseRegion[i] / 10.0D + 1.0D) / 2.0D;
double d5 = MathHelper.clampedLerp(d2, d3, d4) - d1;
heighttemp[i] = d5;
++i; |
<<<<<<<
import micdoodle8.mods.galacticraft.core.entities.EntityFlag;
import micdoodle8.mods.galacticraft.core.entities.player.CapabilityStatsHandler;
import micdoodle8.mods.galacticraft.core.entities.player.IStatsCapability;
=======
import micdoodle8.mods.galacticraft.core.entities.player.GCCapabilities;
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats;
>>>>>>>
import micdoodle8.mods.galacticraft.core.entities.player.GCPlayerStats; |
<<<<<<<
Vec3d vecNewTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(mob, 16, 7, this.thisPos);
=======
Vec3 vecNewTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(mob, 28, 11, this.thisPos);
>>>>>>>
Vec3d vecNewTarget = RandomPositionGenerator.findRandomTargetBlockAwayFrom(mob, 28, 11, this.thisPos);
<<<<<<<
Block air = Blocks.AIR;
=======
if (usingBuckets.getAndSet(true))
{
return;
}
Block air = Blocks.air;
>>>>>>>
if (usingBuckets.getAndSet(true))
{
return;
}
Block air = Blocks.AIR;
<<<<<<<
this.worldObj.setBlockState(vec.toBlockPos(), Blocks.AIR.getDefaultState(), 2);
=======
this.worldObj.setBlockState(vec.toBlockPos(), Blocks.air.getDefaultState(), 4);
>>>>>>>
this.worldObj.setBlockState(vec.toBlockPos(), Blocks.AIR.getDefaultState(), 4); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.