icybear/fabric-carpet
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

20w46a

Browse Source
This commit is contained in:
gnembon committed 2020-11-11 16:18:27 -04:00
1 parent 769e38021c
commit 21700e8d7e
4 files changed
+17 -17
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

gradle.properties
+2 -2
View File
@@ -4,8 +4,8 @@ org.gradle.jvmargs=-Xmx1G
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/use # check these on https://fabricmc.net/use
# or better: https://modmuss50.me/fabric.html # or better: https://modmuss50.me/fabric.html
minecraft_version=20w45a minecraft_version=20w46a
yarn_mappings=20w45a+build.20 yarn_mappings=20w46a+build.2
loader_version=0.10.6+build.214 loader_version=0.10.6+build.214
# Mod Properties # Mod Properties
src/main/java/carpet/mixins/PistonBlockEntityRenderer_movableTEMixin.java
+1 -1
View File
@@ -21,7 +21,7 @@ public abstract class PistonBlockEntityRenderer_movableTEMixin implements BlockE
{ {
BlockEntityRenderDispatcher dispatcher; BlockEntityRenderDispatcher dispatcher;
@Inject(method = "<init>", at = @At("TAIL")) @Inject(method = "<init>", at = @At("TAIL"))
private void onInitCM(BlockEntityRendererFactory.Arguments arguments, CallbackInfo ci) private void onInitCM(BlockEntityRendererFactory.Context arguments, CallbackInfo ci)
{ {
dispatcher = arguments.getRenderDispatcher(); dispatcher = arguments.getRenderDispatcher();
} }
src/main/java/carpet/mixins/TntEntityMixin.java
+5 -5
View File
@@ -20,7 +20,9 @@ import carpet.logging.logHelpers.TNTLogHelper;
@Mixin(TntEntity.class) @Mixin(TntEntity.class)
public abstract class TntEntityMixin extends Entity implements TntEntityInterface public abstract class TntEntityMixin extends Entity implements TntEntityInterface
{ {
@Shadow private int fuseTimer; //@Shadow private int fuseTimer;
@Shadow public abstract int getFuse();
private TNTLogHelper logHelper; private TNTLogHelper logHelper;
private boolean mergeBool = false; private boolean mergeBool = false;
@@ -98,7 +100,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
Vec3d tntVelocity = entityTNTPrimed.getVelocity(); Vec3d tntVelocity = entityTNTPrimed.getVelocity();
if(tntVelocity.x == 0 && tntVelocity.y == 0 && tntVelocity.z == 0 if(tntVelocity.x == 0 && tntVelocity.y == 0 && tntVelocity.z == 0
&& this.getX() == entityTNTPrimed.getX() && this.getZ() == entityTNTPrimed.getZ() && this.getY() == entityTNTPrimed.getY() && this.getX() == entityTNTPrimed.getX() && this.getZ() == entityTNTPrimed.getZ() && this.getY() == entityTNTPrimed.getY()
&& this.fuseTimer == entityTNTPrimed.getFuseTimer()){ && getFuse() == entityTNTPrimed.getFuse()){
mergedTNT += ((TntEntityInterface) entityTNTPrimed).getMergedTNT(); mergedTNT += ((TntEntityInterface) entityTNTPrimed).getMergedTNT();
entityTNTPrimed.discard(); // discard remove(); entityTNTPrimed.discard(); // discard remove();
} }
@@ -108,9 +110,7 @@ public abstract class TntEntityMixin extends Entity implements TntEntityInterfac
} }
} }
@Inject(method = "tick", at = @At(value = "FIELD", @Inject(method = "tick", at = @At(value = "INVOKE", target = "Lnet/minecraft/entity/TntEntity;setFuse(I)V"))
target = "Lnet/minecraft/entity/TntEntity;fuseTimer:I",
ordinal = 0))
private void setMergeable(CallbackInfo ci) private void setMergeable(CallbackInfo ci)
{ {
// Merge code, merge only tnt that have had a chance to move CARPET-XCOM // Merge code, merge only tnt that have had a chance to move CARPET-XCOM
src/main/java/carpet/utils/BlockInfo.java
+9 -9
View File
@@ -72,15 +72,15 @@ public class BlockInfo
put(BlockSoundGroup.CHAIN, "chain"); put(BlockSoundGroup.CHAIN, "chain");
put(BlockSoundGroup.NETHER_GOLD_ORE, "nether_gold_ore"); put(BlockSoundGroup.NETHER_GOLD_ORE, "nether_gold_ore");
put(BlockSoundGroup.GILDED_BLACKSTONE, "gilded_blackstone"); put(BlockSoundGroup.GILDED_BLACKSTONE, "gilded_blackstone");
put(BlockSoundGroup.field_27196, "candle"); put(BlockSoundGroup.CANDLE, "candle");
put(BlockSoundGroup.field_27197, "amethyst"); put(BlockSoundGroup.AMETHYST_BLOCK, "amethyst");
put(BlockSoundGroup.field_27198, "amethyst_cluster"); put(BlockSoundGroup.AMETHYST_CLUSTER, "amethyst_cluster");
put(BlockSoundGroup.field_27199, "small_amethyst_bud"); put(BlockSoundGroup.SMALL_AMETHYST_BUD, "small_amethyst_bud");
put(BlockSoundGroup.field_27200, "large_amethyst_bud"); put(BlockSoundGroup.LARGE_AMETHYST_BUD, "large_amethyst_bud");
put(BlockSoundGroup.field_27201, "medium_amethyst_bud"); put(BlockSoundGroup.MEDIUM_AMETHYST_BUD, "medium_amethyst_bud");
put(BlockSoundGroup.field_27202, "tuff"); put(BlockSoundGroup.TUFF, "tuff");
put(BlockSoundGroup.field_27203, "calcite"); put(BlockSoundGroup.CALCITE, "calcite");
put(BlockSoundGroup.field_27204, "copper"); put(BlockSoundGroup.COPPER, "copper");
}}; }};
public static final Map<MapColor, String> mapColourName = new HashMap<MapColor, String>() {{ public static final Map<MapColor, String> mapColourName = new HashMap<MapColor, String>() {{