fujin/Applied-Energistics-2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More compile things

Browse Source
This commit is contained in:
covers1624
2020-06-02 15:12:30 +09:30
parent 404ef5624b
commit 3f5c299d09
111 changed files with 838 additions and 873 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/appeng/parts/PartPlacement.java
+8 -7
View File
@@ -32,6 +32,7 @@ import net.minecraft.item.BlockItem;
import net.minecraft.item.ItemStack;
import net.minecraft.tileentity.TileEntity;
import net.minecraft.util.ActionResult;
import net.minecraft.util.ActionResultType;
import net.minecraft.util.Direction;
import net.minecraft.util.Hand;
import net.minecraft.util.SoundCategory;
@@ -71,18 +72,18 @@ public class PartPlacement
private final ThreadLocal<Object> placing = new ThreadLocal<>();
private boolean wasCanceled = false;
public static ActionResult<?> place( final ItemStack held, final BlockPos pos, Direction side, final PlayerEntity player, final Hand hand, final World world, PlaceType pass, final int depth )
public static ActionResultType place( final ItemStack held, final BlockPos pos, Direction side, final PlayerEntity player, final Hand hand, final World world, PlaceType pass, final int depth )
{
if( depth > 3 )
{
return ActionResult.resultFail( null );
return ActionResultType.FAIL;
}
if( !held.isEmpty() && Platform.isWrench( player, held, pos ) && player.isShiftKeyDown() )
{
if( !Platform.hasPermissions( new DimensionalCoord( world, pos ), player ) )
{
return ActionResult.resultFail( null );
return ActionResultType.FAIL;
}
final Block block = world.getBlockState( pos ).getBlock();
@@ -98,7 +99,7 @@ public class PartPlacement
{
if( !world.isRemote )
{
final LookDirection dir = Platform.getPlayerRay( player, getEyeOffset( player ) );
final LookDirection dir = Platform.getPlayerRay( player );
final RayTraceResult mop = block.getRayTraceResult( world.getBlockState( pos ), world, pos, dir.getA(), dir.getB(), mop );
if( mop != null )
@@ -137,10 +138,10 @@ public class PartPlacement
player.swingArm( hand );
NetworkHandler.instance().sendToServer( new PacketPartPlacement( pos, side, getEyeOffset( player ), hand ) );
}
return ActionResult.resultSuccess( null );
return ActionResultType.SUCCESS;
}
return ActionResult.resultFail( null );
return ActionResultType.FAIL;
}
TileEntity tile = world.getTileEntity( pos );
@@ -477,4 +478,4 @@ public class PartPlacement
{
PLACE_ITEM, INTERACT_FIRST_PASS, INTERACT_SECOND_PASS
}
}
}
src/main/java/appeng/parts/automation/PartFormationPlane.java
+3 -4
View File
@@ -25,6 +25,7 @@ import java.util.List;
import net.minecraft.entity.Entity;
import net.minecraft.entity.item.EntityItem;
import net.minecraft.entity.item.ItemEntity;
import net.minecraft.entity.player.PlayerEntity;
import net.minecraft.block.Blocks;
import net.minecraft.item.Item;
@@ -310,13 +311,11 @@ public class PartFormationPlane extends PartAbstractFormationPlane<IAEItemStack>
final double y = ( side.yOffset != 0 ? 0 : .7 * ( Platform.getRandomFloat() - .5 ) ) + side.yOffset + .5 + te.getPos().getY();
final double z = ( side.zOffset != 0 ? 0 : .7 * ( Platform.getRandomFloat() - .5 ) ) + side.zOffset + .5 + te.getPos().getZ();
final EntityItem ei = new EntityItem( w, x, y, z, is.copy() );
final ItemEntity ei = new ItemEntity( w, x, y, z, is.copy() );
Entity result = ei;
ei.motionX = side.xOffset * 0.2;
ei.motionY = side.yOffset * 0.2;
ei.motionZ = side.zOffset * 0.2;
ei.setMotion( side.xOffset * 0.2, side.yOffset * 0.2, side.zOffset * 0.2 );
if( is.getItem().hasCustomEntity( is ) )
{
src/main/java/appeng/parts/automation/PlaneBakedModel.java
+12 -13
View File
@@ -22,16 +22,15 @@ package appeng.parts.automation;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
import javax.annotation.Nullable;
import com.google.common.collect.ImmutableList;
import net.minecraft.block.BlockState;
import net.minecraft.client.renderer.model.BakedQuad;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.block.model.ItemCameraTransforms;
import net.minecraft.client.renderer.block.model.ItemOverrideList;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.ItemOverrideList;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.Direction;
@@ -49,13 +48,13 @@ public class PlaneBakedModel implements IBakedModel
private final List<BakedQuad> quads;
PlaneBakedModel( VertexFormat format, TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture, PlaneConnections connections )
PlaneBakedModel( TextureAtlasSprite frontTexture, TextureAtlasSprite sidesTexture, TextureAtlasSprite backTexture, PlaneConnections connections )
{
this.frontTexture = frontTexture;
List<BakedQuad> quads = new ArrayList<>( 4 * 6 );
CubeBuilder builder = new CubeBuilder( format, quads );
CubeBuilder builder = new CubeBuilder( quads );
builder.setTextures( sidesTexture, sidesTexture, frontTexture, backTexture, sidesTexture, sidesTexture );
@@ -72,7 +71,7 @@ public class PlaneBakedModel implements IBakedModel
}
@Override
public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, long rand )
public List<BakedQuad> getQuads( @Nullable BlockState state, @Nullable Direction side, Random rand )
{
if( side == null )
{
@@ -96,6 +95,12 @@ public class PlaneBakedModel implements IBakedModel
return false;
}
@Override
public boolean func_230044_c_()
{
return false;//TODO
}
@Override
public boolean isBuiltInRenderer()
{
@@ -108,12 +113,6 @@ public class PlaneBakedModel implements IBakedModel
return this.frontTexture;
}
@Override
public ItemCameraTransforms getItemCameraTransforms()
{
return ItemCameraTransforms.DEFAULT;
}
@Override
public ItemOverrideList getOverrides()
{
src/main/java/appeng/parts/automation/PlaneModel.java
+25 -27
View File
@@ -19,37 +19,41 @@
package appeng.parts.automation;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Set;
import java.util.function.Function;
import javax.annotation.Nullable;
import com.google.common.collect.Lists;
import com.mojang.datafixers.util.Pair;
import net.minecraft.client.renderer.block.model.IBakedModel;
import net.minecraft.client.renderer.model.IBakedModel;
import net.minecraft.client.renderer.model.IModelTransform;
import net.minecraft.client.renderer.model.IUnbakedModel;
import net.minecraft.client.renderer.model.Material;
import net.minecraft.client.renderer.model.ModelBakery;
import net.minecraft.client.renderer.texture.AtlasTexture;
import net.minecraft.client.renderer.texture.TextureAtlasSprite;
import net.minecraft.client.renderer.vertex.VertexFormat;
import net.minecraft.util.ResourceLocation;
import net.minecraftforge.client.model.IModel;
import net.minecraftforge.common.model.IModelState;
import net.minecraftforge.common.model.TRSRTransformation;
/**
* Built-in model for annihilation planes that supports connected textures.
*/
public class PlaneModel implements IModel
public class PlaneModel implements IUnbakedModel
{
private final ResourceLocation frontTexture;
private final ResourceLocation sidesTexture;
private final ResourceLocation backTexture;
private final Material frontTexture;
private final Material sidesTexture;
private final Material backTexture;
private final PlaneConnections connections;
public PlaneModel( ResourceLocation frontTexture, ResourceLocation sidesTexture, ResourceLocation backTexture, PlaneConnections connections )
{
this.frontTexture = frontTexture;
this.sidesTexture = sidesTexture;
this.backTexture = backTexture;
this.frontTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, frontTexture );
this.sidesTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, sidesTexture );
this.backTexture = new Material( AtlasTexture.LOCATION_BLOCKS_TEXTURE, backTexture );
this.connections = connections;
}
@@ -60,25 +64,19 @@ public class PlaneModel implements IModel
}
@Override
public Collection<ResourceLocation> getTextures()
public Collection<Material> getTextures( Function<ResourceLocation, IUnbakedModel> modelGetter, Set<Pair<String, String>> missingTextureErrors )
{
return Lists.newArrayList( this.frontTexture, this.sidesTexture, this.backTexture );
return Arrays.asList( frontTexture, sidesTexture, backTexture );
}
@Nullable
@Override
public IBakedModel bake( IModelState state, VertexFormat format, Function<ResourceLocation, TextureAtlasSprite> bakedTextureGetter )
public IBakedModel bakeModel( ModelBakery modelBakeryIn, Function<Material, TextureAtlasSprite> spriteGetterIn, IModelTransform transformIn, ResourceLocation locationIn )
{
TextureAtlasSprite frontSprite = bakedTextureGetter.apply( this.frontTexture );
TextureAtlasSprite sidesSprite = bakedTextureGetter.apply( this.sidesTexture );
TextureAtlasSprite backSprite = bakedTextureGetter.apply( this.backTexture );
TextureAtlasSprite frontSprite = spriteGetterIn.apply( this.frontTexture );
TextureAtlasSprite sidesSprite = spriteGetterIn.apply( this.sidesTexture );
TextureAtlasSprite backSprite = spriteGetterIn.apply( this.backTexture );
return new PlaneBakedModel( format, frontSprite, sidesSprite, backSprite, this.connections );
return new PlaneBakedModel( frontSprite, sidesSprite, backSprite, this.connections );
}
@Override
public IModelState getDefaultState()
{
return TRSRTransformation.identity();
}
}