mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2024-12-28 16:06:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'mc1.16/dev' into mc1.16/flw/vanilla-opt

Browse source
This commit is contained in:
Jozufozu 2021-07-23 12:35:56 -07:00
commit 976017d084
5 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gradle.properties
View file

@ -6,18 +6,18 @@ org.gradle.daemon = false
# mod version info # mod version info
mod_version = 0.3.2c mod_version = 0.3.2c
minecraft_version = 1.16.5 minecraft_version = 1.16.5
forge_version = 36.1.32 forge_version = 36.2.0
# build dependency versions # build dependency versions
forgegradle_version = 4.1.+ forgegradle_version = 4.1.+
mixingradle_version = 0.7-SNAPSHOT mixingradle_version = 0.7-SNAPSHOT
shadow_version = 5.2.0 shadow_version = 6.1.0
cursegradle_version = 1.4.0 cursegradle_version = 1.4.0
# dependency versions # dependency versions
registrate_version = 1.0.4 registrate_version = 1.0.4
flywheel_version = 1.16-0.1.1.24 flywheel_version = 1.16-0.1.1.26
jei_version = 7.7.0.106 jei_version = 7.7.1.110
# curseforge information # curseforge information
projectId = 328085 projectId = 328085

1
src/main/java/com/simibubi/create/content/contraptions/itemAssembly/SequencedAssemblyRecipeBuilder.java
View file

@ -98,7 +98,6 @@ public class SequencedAssemblyRecipeBuilder {
public DataGenResult(SequencedAssemblyRecipe recipe, List<ICondition> recipeConditions) { public DataGenResult(SequencedAssemblyRecipe recipe, List<ICondition> recipeConditions) {
this.recipeConditions = recipeConditions; this.recipeConditions = recipeConditions;
this.recipe = recipe; this.recipe = recipe;
recipe.getId();
this.id = new ResourceLocation(recipe.getId().getNamespace(), this.id = new ResourceLocation(recipe.getId().getNamespace(),
AllRecipeTypes.SEQUENCED_ASSEMBLY.getId().getPath() + "/" + recipe.getId().getPath()); AllRecipeTypes.SEQUENCED_ASSEMBLY.getId().getPath() + "/" + recipe.getId().getPath());
this.serializer = (SequencedAssemblyRecipeSerializer) recipe.getSerializer(); this.serializer = (SequencedAssemblyRecipeSerializer) recipe.getSerializer();

14
src/main/java/com/simibubi/create/content/curiosities/weapons/PotatoCannonProjectileTypes.java
View file

@ -46,6 +46,8 @@ import net.minecraft.world.World;
import net.minecraft.world.server.ServerWorld; import net.minecraft.world.server.ServerWorld;
import net.minecraftforge.common.IPlantable; import net.minecraftforge.common.IPlantable;
import net.minecraftforge.common.util.FakePlayer; import net.minecraftforge.common.util.FakePlayer;
import net.minecraftforge.event.ForgeEventFactory;
import net.minecraftforge.event.entity.living.EntityTeleportEvent;
import net.minecraftforge.registries.IRegistryDelegate; import net.minecraftforge.registries.IRegistryDelegate;
public class PotatoCannonProjectileTypes { public class PotatoCannonProjectileTypes {
@ -447,14 +449,10 @@ public class PotatoCannonProjectileTypes {
double teleportY = MathHelper.clamp(entityY + (livingEntity.getRandom().nextInt((int) teleportDiameter) - (int) (teleportDiameter / 2)), 0.0D, world.getHeight() - 1); double teleportY = MathHelper.clamp(entityY + (livingEntity.getRandom().nextInt((int) teleportDiameter) - (int) (teleportDiameter / 2)), 0.0D, world.getHeight() - 1);
double teleportZ = entityZ + (livingEntity.getRandom().nextDouble() - 0.5D) * teleportDiameter; double teleportZ = entityZ + (livingEntity.getRandom().nextDouble() - 0.5D) * teleportDiameter;
/* Usable as soon as lowest supported forge > 36.1.3 */ EntityTeleportEvent.ChorusFruit event = ForgeEventFactory.onChorusFruitTeleport(livingEntity, teleportX, teleportY, teleportZ);
if (event.isCanceled())
// EntityTeleportEvent.ChorusFruit event = ForgeEventFactory.onChorusFruitTeleport(livingEntity, teleportX, teleportY, teleportZ); return false;
// if (event.isCanceled()) if (livingEntity.randomTeleport(event.getTargetX(), event.getTargetY(), event.getTargetZ(), true)) {
// return;
// if (livingEntity.attemptTeleport(event.getTargetX(), event.getTargetY(), event.getTargetZ(), true)) {
if (livingEntity.randomTeleport(teleportX, teleportY, teleportZ, true)) {
if (livingEntity.isPassenger()) if (livingEntity.isPassenger())
livingEntity.stopRiding(); livingEntity.stopRiding();

12
src/main/java/com/simibubi/create/foundation/ponder/PonderRegistry.java
View file

@ -2,6 +2,7 @@ package com.simibubi.create.foundation.ponder;
import java.io.BufferedInputStream; import java.io.BufferedInputStream;
import java.io.DataInputStream; import java.io.DataInputStream;
import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
@ -140,15 +141,12 @@ public class PonderRegistry {
String path = "ponder/" + location.getPath() + ".nbt"; String path = "ponder/" + location.getPath() + ".nbt";
ResourceLocation location1 = new ResourceLocation(namespace, path); ResourceLocation location1 = new ResourceLocation(namespace, path);
if (!resourceManager.hasResource(location1)) { try (IResource resource = resourceManager.getResource(location1)) {
Create.LOGGER.error("Ponder schematic missing: " + location1);
return new Template();
}
try {
IResource resource = resourceManager.getResource(location1);
return loadSchematic(resource.getInputStream()); return loadSchematic(resource.getInputStream());
} catch (FileNotFoundException e) {
Create.LOGGER.error("Ponder schematic missing: " + location1, e);
} catch (IOException e) { } catch (IOException e) {
Create.LOGGER.error("Failed to read ponder schematic: " + path, e); Create.LOGGER.error("Failed to read ponder schematic: " + location1, e);
} }
return new Template(); return new Template();
} }

2
src/main/resources/META-INF/mods.toml
View file

@ -18,7 +18,7 @@ Technology that empowers the player.'''
[[dependencies.create]] [[dependencies.create]]
modId="forge" modId="forge"
mandatory=true mandatory=true
versionRange="[36.1.0,)" versionRange="[36.2.0,)"
ordering="NONE" ordering="NONE"
side="BOTH" side="BOTH"