Skip to content

Commit 1538fe8

Browse files
committed
Got some work done, check description!
Switched Mappings, switched gradle version to a newer release (the previous one was missing on the gradle repo), changed textures for the exposer, added 4 stages to the silver mirror and updated its textures, fixed the lead block not rendering when inside of it by ATing a needed method (notSolidBlocking).
1 parent 3a54dcd commit 1538fe8

36 files changed

+50
-25
lines changed

build.gradle

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,19 @@
11
buildscript {
22
repositories {
33
// These repositories are only for Gradle plugins, put any other repositories in the repository block further below
4+
// zKryle (23/11/21) - don't worry about this parchment maven repo, it should be here, otherwise mappings won't work.
5+
maven { url = 'https://maven.parchmentmc.org' }
46
maven { url = 'https://maven.minecraftforge.net' }
57
mavenCentral()
68
}
79
dependencies {
810
classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
11+
classpath 'org.parchmentmc:librarian:1.+'
912
}
1013
}
1114
apply plugin: 'net.minecraftforge.gradle'
1215
// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
16+
apply plugin: 'org.parchmentmc.librarian.forgegradle'
1317
apply plugin: 'eclipse'
1418
apply plugin: 'maven-publish'
1519

@@ -33,9 +37,9 @@ minecraft {
3337
//
3438
// Use non-default mappings at your own risk. They may not always work.
3539
// Simply re-run your setup task after changing the mappings to update your workspace.
36-
mappings channel: 'official', version: '1.17.1'
40+
mappings channel: 'parchment', version: '2021.10.31-1.17.1'
3741

38-
// accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
42+
accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg') // Currently, this location cannot be changed from the default.
3943

4044
// Default run configurations.
4145
// These can be tweaked, removed, or duplicated as needed.
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210702220150+0000-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions-snapshots/gradle-7.2-20210909000652+0000-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

logs/debug.log

Whitespace-only changes.

logs/latest.log

Whitespace-only changes.

src/main/java/me/gleep/oreganized/Oreganized.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ private void doClientStuff(final FMLClientSetupEvent event) {
9898
event.enqueueWork(() -> ItemProperties.register(RegistryHandler.SILVER_MIRROR.get(),
9999
new ResourceLocation(Oreganized.MOD_ID + ":dist"),
100100
(ItemStack p_174676_, @Nullable ClientLevel p_174677_, @Nullable LivingEntity p_174678_, int p_174679_) ->
101-
p_174676_.getTag() != null ? p_174676_.getTag().getInt("Dist") : 4)
101+
p_174676_.getTag() != null ? p_174676_.getTag().getInt("Dist") : 8)
102102
);
103103
event.enqueueWork(() -> ItemProperties.register(RegistryHandler.SILVER_TINTED_DIAMOND_BOOTS.get(),
104104
new ResourceLocation(Oreganized.MOD_ID + ":tinted_damage"),

src/main/java/me/gleep/oreganized/blocks/MoltenLeadBlock.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,12 @@
4444

4545
public class MoltenLeadBlock extends Block implements BucketPickup {
4646
public MoltenLeadBlock() {
47-
super(BlockBehaviour.Properties.of((new Material.Builder(MaterialColor.COLOR_PURPLE)).noCollider().nonSolid().liquid().build())
47+
super(BlockBehaviour.Properties.of((new Material.Builder(MaterialColor.COLOR_PURPLE)).noCollider().notSolidBlocking().nonSolid().liquid().build())
4848
.strength(-1.0F, 3600000.0F)
4949
.noDrops()
5050
.requiresCorrectToolForDrops());
5151
}
5252

53-
54-
5553
@Override
5654
public boolean skipRendering(BlockState p_60532_, BlockState p_60533_, Direction p_60534_) {
5755
return super.skipRendering(p_60532_, p_60533_, p_60534_);

src/main/java/me/gleep/oreganized/items/SilverMirror.java

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public SilverMirror() {
2525

2626
@Override
2727
public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, int p_41407_, boolean p_41408_) {
28-
int dist = 4;
28+
int dist = 8;
2929

3030
if (!(p_41406_ instanceof Player)) return;
3131
CompoundTag nbt = new CompoundTag();
@@ -42,20 +42,20 @@ public void inventoryTick(ItemStack p_41404_, Level p_41405_, Entity p_41406_, i
4242
if (living.isInvertedHealAndHarm()) {
4343
isUndeadNearby = true;
4444
double distance = living.distanceTo(player);
45-
if (distance < SilverBlock.RANGE && ((int) Math.ceil(distance / (SilverBlock.RANGE / 4))) < dist) {
46-
if (distance <= 6) {
45+
if (distance < SilverBlock.RANGE && ((int) Math.ceil(distance / (SilverBlock.RANGE / 8))) < dist) {
46+
if (distance < 6) {
4747
dist = 1;
48-
} else dist = Math.max((int) Math.ceil(distance / (SilverBlock.RANGE / 4)), 2);
48+
} else dist = Math.max( (int) Math.ceil(distance / (SilverBlock.RANGE / 8)), 2);
4949

50-
if (dist > 3) {
51-
dist = 3;
50+
if (dist > 8) {
51+
dist = 8;
5252
}
5353
}
5454
}
5555
}
5656

5757
if (!isUndeadNearby) {
58-
dist = 4;
58+
dist = 8;
5959
}
6060

6161
nbt.putInt("Dist", dist);
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
public net.minecraft.world.level.material.Material$Builder m_76360_()Lnet/minecraft/world/level/material/Material$Builder; # notSolidBlocking

src/main/resources/assets/oreganized/models/item/silver_mirror.json

+8-4
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@
44
"layer0": "oreganized:item/silver_mirror"
55
},
66
"overrides": [
7-
{ "predicate": { "oreganized:dist": 1 }, "model": "oreganized:item/silver_mirror_level_1" },
8-
{ "predicate": { "oreganized:dist": 2 }, "model": "oreganized:item/silver_mirror_level_2" },
9-
{ "predicate": { "oreganized:dist": 3 }, "model": "oreganized:item/silver_mirror_level_3" },
10-
{ "predicate": { "oreganized:dist": 4 }, "model": "oreganized:item/silver_mirror_level_4" }
7+
{ "predicate": { "oreganized:dist": 1 }, "model": "oreganized:item/silver_mirror_level_7" },
8+
{ "predicate": { "oreganized:dist": 2 }, "model": "oreganized:item/silver_mirror_level_6" },
9+
{ "predicate": { "oreganized:dist": 3 }, "model": "oreganized:item/silver_mirror_level_5" },
10+
{ "predicate": { "oreganized:dist": 4 }, "model": "oreganized:item/silver_mirror_level_4" },
11+
{ "predicate": { "oreganized:dist": 5 }, "model": "oreganized:item/silver_mirror_level_3" },
12+
{ "predicate": { "oreganized:dist": 6 }, "model": "oreganized:item/silver_mirror_level_2" },
13+
{ "predicate": { "oreganized:dist": 7 }, "model": "oreganized:item/silver_mirror_level_1" },
14+
{ "predicate": { "oreganized:dist": 8 }, "model": "oreganized:item/silver_mirror_level_0" }
1115
]
1216
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "oreganized:item/silver_mirror"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "item/generated",
33
"textures": {
4-
"layer0": "oreganized:item/silver_mirror"
4+
"layer0": "oreganized:item/silver_mirror_level_3"
55
}
66
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "oreganized:item/silver_mirror_level_5"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "oreganized:item/silver_mirror_level_6"
5+
}
6+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "item/generated",
3+
"textures": {
4+
"layer0": "oreganized:item/silver_mirror_level_7"
5+
}
6+
}
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

src/main/resources/assets/oreganized/textures/block/exposer_level_3.png.mcmeta

-6
This file was deleted.
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading
Loading

0 commit comments

Comments
 (0)