tilera/CreateMod
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix saw blade culling

Browse source 
- Remove AllColorHandlers as it was empty
- Organize imports
This commit is contained in:
PepperBell 2021-07-08 11:17:35 -07:00
parent 5a031bb99d
commit cf3ef8c229
9 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
src/main/java/com/simibubi/create/AllColorHandlers.java
View file

2
src/main/java/com/simibubi/create/AllItems.java
View file

@ -1,10 +1,10 @@
package com.simibubi.create;
import static com.simibubi.create.AllTags.forgeItemTag;
import static com.simibubi.create.AllTags.AllItemTags.CREATE_INGOTS;
import static com.simibubi.create.AllTags.AllItemTags.CRUSHED_ORES;
import static com.simibubi.create.AllTags.AllItemTags.NUGGETS;
import static com.simibubi.create.AllTags.AllItemTags.PLATES;
import static com.simibubi.create.AllTags.forgeItemTag;
import static com.simibubi.create.content.AllSections.CURIOSITIES;
import static com.simibubi.create.content.AllSections.KINETICS;
import static com.simibubi.create.content.AllSections.LOGISTICS;

4
src/main/java/com/simibubi/create/compat/Mods.java
View file

@ -1,10 +1,10 @@
package com.simibubi.create.compat;
import net.minecraftforge.fml.ModList;
import java.util.Optional;
import java.util.function.Supplier;
import net.minecraftforge.fml.ModList;
/**
* For compatibility with and without another mod present, we have to define load conditions of the specific code
*/

3
src/main/java/com/simibubi/create/content/contraptions/components/actors/HarvesterTileEntity.java
View file

@ -4,6 +4,8 @@ import com.simibubi.create.foundation.tileEntity.SyncedTileEntity;
import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
public class HarvesterTileEntity extends SyncedTileEntity {
@ -17,6 +19,7 @@ public class HarvesterTileEntity extends SyncedTileEntity {
}
@Override
@OnlyIn(Dist.CLIENT)
public AxisAlignedBB getRenderBoundingBox() {
return RENDER_BOX.offset(pos);
}

6
src/main/java/com/simibubi/create/content/contraptions/components/actors/SawMovementBehaviour.java
View file

@ -1,11 +1,13 @@
package com.simibubi.create.content.contraptions.components.actors;
import java.util.Optional;
import com.simibubi.create.content.contraptions.components.saw.SawBlock;
import com.simibubi.create.content.contraptions.components.saw.SawRenderer;
import com.simibubi.create.content.contraptions.components.saw.SawTileEntity;
import com.simibubi.create.content.contraptions.components.structureMovement.MovementContext;
import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue;
import com.simibubi.create.content.contraptions.components.structureMovement.render.ContraptionMatrices;
import com.simibubi.create.foundation.utility.AbstractBlockBreakQueue;
import com.simibubi.create.foundation.utility.TreeCutter;
import com.simibubi.create.foundation.utility.VecHelper;
import com.simibubi.create.foundation.utility.worldWrappers.PlacementSimulationWorld;
@ -24,8 +26,6 @@ import net.minecraftforge.api.distmarker.Dist;
import net.minecraftforge.api.distmarker.OnlyIn;
import net.minecraftforge.items.ItemHandlerHelper;
import java.util.Optional;
public class SawMovementBehaviour extends BlockBreakingMovementBehaviour {
@Override

10
src/main/java/com/simibubi/create/content/contraptions/components/saw/SawTileEntity.java
View file

@ -56,6 +56,7 @@ import net.minecraft.tileentity.TileEntityType;
import net.minecraft.util.Direction;
import net.minecraft.util.LazyValue;
import net.minecraft.util.ResourceLocation;
import net.minecraft.util.math.AxisAlignedBB;
import net.minecraft.util.math.BlockPos;
import net.minecraft.util.math.MathHelper;
import net.minecraft.util.math.vector.Vector3d;
@ -71,6 +72,8 @@ import net.minecraftforge.items.IItemHandler;
@MethodsReturnNonnullByDefault
public class SawTileEntity extends BlockBreakingKineticTileEntity {
private static final AxisAlignedBB RENDER_BOX = new AxisAlignedBB(0, 0, 0, 1, 1, 1);
private static final Object cuttingRecipesKey = new Object();
public static final LazyValue<IRecipeType<?>> woodcuttingRecipeType =
new LazyValue<>(() -> Registry.RECIPE_TYPE.getOrDefault(new ResourceLocation("druidcraft", "woodcutting")));
@ -120,6 +123,13 @@ public class SawTileEntity extends BlockBreakingKineticTileEntity {
playEvent = ItemStack.read(compound.getCompound("PlayEvent"));
}
@Override
protected AxisAlignedBB makeRenderBoundingBox() {
Direction facing = getBlockState().get(SawBlock.FACING);
AxisAlignedBB box = RENDER_BOX.expand(facing.getXOffset() * 0.125f, facing.getYOffset() * 0.125f, facing.getZOffset() * 0.125f);
return box.offset(pos);
}
@Override
@OnlyIn(Dist.CLIENT)
public void tickAudio() {

1
src/main/java/com/simibubi/create/content/contraptions/processing/ProcessingRecipeBuilder.java
View file

@ -7,7 +7,6 @@ import java.util.function.Consumer;
import com.google.gson.JsonArray;
import com.google.gson.JsonObject;
import com.simibubi.create.AllRecipeTypes;
import com.simibubi.create.Create;
import com.simibubi.create.foundation.fluid.FluidHelper;
import com.simibubi.create.foundation.fluid.FluidIngredient;
import com.simibubi.create.foundation.utility.Lang;

3
src/main/java/com/simibubi/create/content/logistics/item/filter/ItemAttribute.java
View file

@ -9,8 +9,6 @@ import java.util.function.BiPredicate;
import java.util.function.Predicate;
import java.util.stream.Collectors;
import com.simibubi.create.content.logistics.item.filter.attribute.ShulkerFillLevelAttribute;
import org.apache.commons.lang3.StringUtils;
import com.simibubi.create.AllRecipeTypes;
@ -21,6 +19,7 @@ import com.simibubi.create.content.logistics.item.filter.attribute.ColorAttribut
import com.simibubi.create.content.logistics.item.filter.attribute.EnchantAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.FluidContentsAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.ItemNameAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.ShulkerFillLevelAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryAmuletAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryAttunementAttribute;
import com.simibubi.create.content.logistics.item.filter.attribute.astralsorcery.AstralSorceryCrystalAttribute;

2
src/main/java/com/simibubi/create/foundation/utility/TreeCutter.java
View file

@ -14,9 +14,7 @@ import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import com.simibubi.create.AllTags;
import com.simibubi.create.compat.Mods;
import com.simibubi.create.compat.dynamictrees.DynamicTree;
import net.minecraft.block.BambooBlock;